jerenkrantz 2002/09/01 09:54:41
Modified: include apr_atomic.h
Log:
Delay definition of APR_ATOMIC_NEED_DEFAULT_INIT to be 0 and only do so if it
isn't previously defined.
(Silences all sorts of redefinition warnings.)
Revision Changes Path
1.35 +4 -2 apr/include/apr_atomic.h
Index: apr_atomic.h
===================================================================
RCS file: /home/cvs/apr/include/apr_atomic.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- apr_atomic.h 31 Aug 2002 22:56:17 -0000 1.34
+++ apr_atomic.h 1 Sep 2002 16:54:41 -0000 1.35
@@ -246,8 +246,6 @@
* with a different signature than the default.)
*/
-#define APR_ATOMIC_NEED_DEFAULT_INIT 0
-
#if !defined(apr_atomic_t)
#define apr_atomic_t apr_uint32_t
#endif
@@ -283,6 +281,10 @@
#if !defined(apr_atomic_cas) && !defined(APR_OVERRIDE_ATOMIC_CAS)
apr_uint32_t apr_atomic_cas(volatile apr_uint32_t *mem,long with,long cmp);
#define APR_ATOMIC_NEED_DEFAULT_INIT 1
+#endif
+
+#ifndef APR_ATOMIC_NEED_DEFAULT_INIT
+#define APR_ATOMIC_NEED_DEFAULT_INIT 0
#endif
/* If we're using the default versions of any of the atomic functions,
