summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-12-09 16:49:07 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-12-09 16:49:07 +0100
commitabdc2870f1ebbf21a1b865804c512b1ffbeebb3a (patch)
tree97729d1cb230f3aabb79e05d1c233478a8a84412 /tools
parent9e8556538a9ca220e7262271993200c1c03c2450 (diff)
downloadrsyslog-abdc2870f1ebbf21a1b865804c512b1ffbeebb3a.tar.gz
rsyslog-abdc2870f1ebbf21a1b865804c512b1ffbeebb3a.tar.xz
rsyslog-abdc2870f1ebbf21a1b865804c512b1ffbeebb3a.zip
worked around an issue where omfile failed to compile on 32 bit platforms
...under some circumstances (this smells like a gcc problem, but a simple solution was available). Thanks to Kenneth Marshall for some advice. [backported from 5.5.x branch]
Diffstat (limited to 'tools')
-rw-r--r--tools/omfile.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/omfile.c b/tools/omfile.c
index 13bb74ad..3a206ebf 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -83,7 +83,11 @@ DEFobjCurrIf(strm)
* That should be sufficient (and even than, there would no really bad effect ;)).
* The variable below is the global counter/clock.
*/
+#if HAVE_ATOMIC_BUILTINS_64BIT
static uint64 clockFileAccess = 0;
+#else
+static unsigned clockFileAccess = 0;
+#endif
/* and the "tick" function */
static inline uint64
getClockFileAccess(void)