diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-02 06:42:36 +0000 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-02 06:42:36 +0000 |
commit | eaad044b56eebdffe57d46a7c233ed144b541f9f (patch) | |
tree | c8c183fd2c9ba672d00d6e0814535fd25640732f | |
parent | f7de219916f9092ac4667820bd480dd1d8a0e4a0 (diff) | |
download | rsyslog-eaad044b56eebdffe57d46a7c233ed144b541f9f.tar.gz rsyslog-eaad044b56eebdffe57d46a7c233ed144b541f9f.tar.xz rsyslog-eaad044b56eebdffe57d46a7c233ed144b541f9f.zip |
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
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Makefile.am | 5 | ||||
-rw-r--r-- | atomic.h | 9 |
3 files changed, 10 insertions, 6 deletions
@@ -3,6 +3,8 @@ 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 diff --git a/Makefile.am b/Makefile.am index eb0497a6..4b6602b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -171,11 +171,6 @@ endif # relp support # if ENABLE_RELP -pkglib_LTLIBRARIES += lmrelputil.la -lmrelputil_la_SOURCES = relputil.c relputil.h -lmrelputil_la_CPPFLAGS = $(pthreads_cflags) $(relp_cflags) -lmrelputil_la_LDFLAGS = -module -avoid-version -lmrelputil_la_LIBADD = $(relp_libs) endif EXTRA_DIST = \ @@ -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 */ |