disabled atomic operations for the time being because they introduce some

    cross-platform trouble - need to see how to fix this in the best
    possible way

2 files changed, 13 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 25cd1106..3a13cccf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------
+Version 3.15.1 (rgerhards), 2008-04-??
+- disabled atomic operations for the time being because they introduce some
+  cross-platform trouble - need to see how to fix this in the best 
+  possible way
+---------------------------------------------------------------------------
 Version 3.15.0 (rgerhards), 2008-04-01
 - major new feature: imrelp/omrelp support reliable delivery of syslog
   messages via the RELP protocol and librelp (http://www.librelp.com).
diff --git a/atomic.h b/atomic.h
index 1883e030..2421c826 100644
--- a/atomic.h
+++ b/atomic.h
@@ -36,8 +36,15 @@
 #define INCLUDED_ATOMIC_H
 
 /* set the following to 1 if we have atomic operations (and #undef it otherwise) */
-#define DO_HAVE_ATOMICS 1
+/* #define DO_HAVE_ATOMICS 1 */
+/* for this release, we disable atomic calls because there seem to be some
+ * portability problems and we can not fix that without destabilizing the build.
+ * They simply came in too late. -- rgerhards, 2008-04-02
+ */
+/* make sure they are not used!
 #define ATOMIC_INC(data) ((void) __sync_fetch_and_add(&data, 1))
 #define ATOMIC_DEC_AND_FETCH(data) __sync_sub_and_fetch(&data, 1)
+*/
+#define ATOMIC_INC(data) (++(data))
 
 #endif /* #ifndef INCLUDED_ATOMIC_H */