summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormono_matsuko <aiueov@hotmail.co.jp>2011-09-05 12:18:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-09-05 12:18:11 +0200
commitfb7fab511e0de2566c0de47468b443ef5bb508d3 (patch)
tree29591e441b55ad1607ce3d46ef8e5d04844334e8
parent47f378fb87b5e8cef9c582e5da10e87e0e837a07 (diff)
downloadrsyslog-fb7fab511e0de2566c0de47468b443ef5bb508d3.tar.gz
rsyslog-fb7fab511e0de2566c0de47468b443ef5bb508d3.tar.xz
rsyslog-fb7fab511e0de2566c0de47468b443ef5bb508d3.zip
bugfix: rsyslogd -v always said 64 atomics were not present
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
-rw-r--r--ChangeLog4
-rw-r--r--tools/syslogd.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index de4e4b5d..ca49eb11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
---------------------------------------------------------------------------
+Version 5.8.6 [V5-stable] (rgerhards/al), 2011-??-??
+- bugfix: rsyslogd -v always said 64 atomics were not present
+ thanks to mono_matsuko for the patch
+---------------------------------------------------------------------------
Version 5.8.5 [V5-stable] (rgerhards/al), 2011-09-01
- bugfix/security: off-by-two bug in legacy syslog parser, CVE-2011-3200
- bugfix: mark message processing did not work correctly
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 096f9309..6bed6a1a 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -2129,7 +2129,7 @@ static void printVersion(void)
#else
printf("\t32bit Atomic operations supported:\tNo\n");
#endif
-#ifdef HAVE_ATOMIC_BUILTINS64
+#ifdef HAVE_ATOMIC_BUILTINS_64BIT
printf("\t64bit Atomic operations supported:\tYes\n");
#else
printf("\t64bit Atomic operations supported:\tNo\n");