wrowe 2002/06/08 15:19:51
Modified: . apr.dsp libapr.dsp
Added: include/arch/win32 inherit.h
Log:
Prepare for win32 inherit.h
Revision Changes Path
1.104 +1 -1 apr/apr.dsp
Index: apr.dsp
===================================================================
RCS file: /home/cvs/apr/apr.dsp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- apr.dsp 8 Jun 2002 18:54:57 -0000 1.103
+++ apr.dsp 8 Jun 2002 22:19:50 -0000 1.104
@@ -424,7 +424,7 @@
# End Source File
# Begin Source File
-SOURCE=.\include\arch\unix\inherit.h
+SOURCE=.\include\arch\win32\inherit.h
# End Source File
# Begin Source File
1.65 +1 -1 apr/libapr.dsp
Index: libapr.dsp
===================================================================
RCS file: /home/cvs/apr/libapr.dsp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- libapr.dsp 8 Jun 2002 18:54:57 -0000 1.64
+++ libapr.dsp 8 Jun 2002 22:19:50 -0000 1.65
@@ -430,7 +430,7 @@
# End Source File
# Begin Source File
-SOURCE=.\include\arch\unix\inherit.h
+SOURCE=.\include\arch\win32\inherit.h
# End Source File
# Begin Source File
1.1 apr/include/arch/win32/inherit.h
Index: inherit.h
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2002 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 INHERIT_H
#define INHERIT_H
#include "apr_inherit.h"
#define APR_INHERIT (2^24) /* Must not conflicts with other bits */
#define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup) \
void apr_##name##_inherit_set(apr_##name##_t *name) \
{ \
if (!(name->flag & APR_INHERIT)) { \
name->flag |= APR_INHERIT; \
apr_pool_child_cleanup_set(name->pool, (void *)name, \
cleanup, apr_pool_cleanup_null); \
} \
} \
/* Deprecated */ \
void apr_##name##_set_inherit(apr_##name##_t *name) \
{ \
apr_##name##_inherit_set(apr_##name##_t *name) \
}
#define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup) \
void apr_##name##_inherit_unset(apr_##name##_t *name) \
{ \
if (name->flag & APR_INHERIT) { \
name->flag &= ~APR_INHERIT; \
apr_pool_child_cleanup_set(name->pool, (void *)name, \
cleanup, cleanup); \
} \
} \
/* Deprecated */ \
void apr_##name##_unset_inherit(apr_##name##_t *name) \
{ \
apr_##name##_inherit_unset(apr_##name##_t *name) \
}
#endif /* ! INHERIT_H */
