dreid 01/05/09 09:44:48
Modified: include apr_tracking_memory_system.h apr_memory_system.h Log: Thought I'd already added the licence to the main memory header, so here it is. Also some small changes to make the files more usable. Revision Changes Path 1.2 +1 -0 apr/include/apr_tracking_memory_system.h Index: apr_tracking_memory_system.h =================================================================== RCS file: /home/cvs/apr/include/apr_tracking_memory_system.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr_tracking_memory_system.h 2001/05/09 15:33:20 1.1 +++ apr_tracking_memory_system.h 2001/05/09 16:44:45 1.2 @@ -55,6 +55,7 @@ #ifndef APR_TRACKING_MEMORY_SYSTEM_H #define APR_TRACKING_MEMORY_SYSTEM_H +#include "apr.h" #include "apr_memory_system.h" #ifdef __cplusplus 1.2 +55 -11 apr/include/apr_memory_system.h Index: apr_memory_system.h =================================================================== RCS file: /home/cvs/apr/include/apr_memory_system.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apr_memory_system.h 2001/05/09 15:33:20 1.1 +++ apr_memory_system.h 2001/05/09 16:44:46 1.2 @@ -1,12 +1,61 @@ -/* strikerXXX: license goes here */ - +/* ==================================================================== + * The Apache Software License, Version 1.1 + * + * Copyright (c) 2000-2001 The Apache Software Foundation. All rights + * reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes software developed by the + * Apache Software Foundation (http://www.apache.org/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Apache" and "Apache Software Foundation" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact [EMAIL PROTECTED] + * + * 5. Products derived from this software may not be called "Apache", + * nor may "Apache" appear in their name, without prior written + * permission of the Apache Software Foundation. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * <http://www.apache.org/>. + */ + #ifndef APR_MEMORY_SYSTEM_H #define APR_MEMORY_SYSTEM_H -/* strikerXXX: includes go here */ -/* strikerXXX: HACK ALERT */ -//#include "apr_stuff.h" -/* END OF HACK */ +#include "apr.h" #ifdef __cplusplus extern "C" { @@ -14,11 +63,6 @@ /** * @package APR memory system - */ - - -/* - * */ typedef struct apr_memory_system_t apr_memory_system_t;
