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, 15 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f044fb63..202ed851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,13 @@ Version 3.15.0 (rgerhards), 2008-04-01
   only installed if corresponding option is selected. Thanks to
   Michael Biebl for pointing these problems out.
 ---------------------------------------------------------------------------
+Version 3.14.0 (rgerhards), 2008-04-02
+- bugfix: rsyslogd was no longer build by default; man pages are 
+  only installed if corresponding option is selected. Thanks to
+  Michael Biebl for pointing these problems out.
+- disabled atomic operations for this stable build as it caused
+  platform problems
+---------------------------------------------------------------------------
 Version 3.13.0-dev0 (rgerhards), 2008-03-31
 - bugfix: accidently set debug option in 3.12.5 reset to production
   This option prevented dlclose() to be called. It had no real bad effects,
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 */