diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-26 12:12:48 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-26 12:12:48 +0200 |
commit | 76b4c6547d5526a375ee217e2722a164c811c58c (patch) | |
tree | cbcca91a01d64106e3b26480d08c7e8766735d2b /tools/syslogd.c | |
parent | 0509f1404170c5aff7c9a154fbe882f4d067b1e4 (diff) | |
parent | b26387e6b28630b8e5e3582039141ebf1c7455e3 (diff) | |
download | rsyslog-76b4c6547d5526a375ee217e2722a164c811c58c.tar.gz rsyslog-76b4c6547d5526a375ee217e2722a164c811c58c.tar.xz rsyslog-76b4c6547d5526a375ee217e2722a164c811c58c.zip |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r-- | tools/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 25ab05cd..78b9933f 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2124,7 +2124,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"); |