diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 18:04:00 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 18:04:00 +0100 |
commit | 786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e (patch) | |
tree | 1948874c8d8b7a876ad5e3817a292889b94a68d4 /tools | |
parent | 950fe206f84322bdff755988403a9d4017ec26f4 (diff) | |
parent | 44300ddcb2904105e2ecd56479bf396399dcab26 (diff) | |
download | rsyslog-786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e.tar.gz rsyslog-786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e.tar.xz rsyslog-786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e.zip |
Merge branch 'v5-devel'
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'tools')
-rw-r--r-- | tools/omfile.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/omfile.c b/tools/omfile.c index 4f89f2ac..3a74550b 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -101,7 +101,11 @@ static pthread_mutex_t mutClock; static inline uint64 getClockFileAccess(void) { - return ATOMIC_INC_AND_FETCH(&clockFileAccess, &mutClock); +#if HAVE_ATOMIC_BUILTINS_64BIT + return ATOMIC_INC_AND_FETCH_uint64(&clockFileAccess, &mutClock); +#else + return ATOMIC_INC_AND_FETCH_unsigned(&clockFileAccess, &mutClock); +#endif } |