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]

4 files changed, 62 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index adaa4afa..362222f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,10 @@ Version 5.3.6  [BETA] (rgerhards), 2009-11-??
   Thanks to Jonathan Bond-Caron for the patch.
 - bugfix: $CreateDirs variable not properly initialized, default thus
   was random (but most often "on") [imported from v3]
+- 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]
 ---------------------------------------------------------------------------
 Version 5.3.5  [BETA] (rgerhards), 2009-11-13
 - some light performance enhancement by replacing time() call with much
diff --git a/configure.ac b/configure.ac
index d850dfda..85f2c75a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,6 +128,7 @@ AC_TRY_COMPILE([
 
 # check for availability of atomic operations
 RS_ATOMIC_OPERATIONS
+RS_ATOMIC_OPERATIONS_64BIT
 
 
 # Additional module directories
diff --git a/m4/atomic_operations_64bit.m4 b/m4/atomic_operations_64bit.m4
new file mode 100644
index 00000000..3121cf15
--- /dev/null
+++ b/m4/atomic_operations_64bit.m4
@@ -0,0 +1,53 @@
+# rsyslog
+#
+# atomic_operations.m4 - autoconf macro to check if compiler supports atomic
+# operations
+#
+# rgerhards, 2008-09-18, added based on
+# http://svn.apache.org/repos/asf/apr/apr/trunk/configure.in
+#
+#
+AC_DEFUN([RS_ATOMIC_OPERATIONS_64BIT],
+[AC_CACHE_CHECK([whether the compiler provides atomic builtins for 64 bit data types], [ap_cv_atomic_builtins_64],
+[AC_TRY_RUN([
+int main()
+{
+    unsigned long long val = 1010, tmp, *mem = &val;
+
+    if (__sync_fetch_and_add(&val, 1010) != 1010 || val != 2020)
+        return 1;
+
+    tmp = val;
+
+    if (__sync_fetch_and_sub(mem, 1010) != tmp || val != 1010)
+        return 1;
+
+    if (__sync_sub_and_fetch(&val, 1010) != 0 || val != 0)
+        return 1;
+
+    tmp = 3030;
+
+    if (__sync_val_compare_and_swap(mem, 0, tmp) != 0 || val != tmp)
+        return 1;
+
+    if (__sync_lock_test_and_set(&val, 4040) != 3030)
+        return 1;
+
+    mem = &tmp;
+
+    if (__sync_val_compare_and_swap(&mem, &tmp, &val) != &tmp)
+        return 1;
+
+    __sync_synchronize();
+
+    if (mem != &val)
+        return 1;
+
+    return 0;
+}], [ap_cv_atomic_builtins_64=yes], [ap_cv_atomic_builtins_64=no], [ap_cv_atomic_builtins_64=no])])
+
+if test "$ap_cv_atomic_builtins_64" = "yes"; then
+    AC_DEFINE(HAVE_ATOMIC_BUILTINS_64BIT, 1, [Define if compiler provides 64 bit atomic builtins])
+fi
+
+])
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)