diff options
| author | Michael Biebl <biebl@debian.org> | 2010-11-30 15:09:49 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-11-30 15:09:49 +0100 |
| commit | 0a5a3fba01d42ef3b380c4ae27699bb42c3af493 (patch) | |
| tree | cba36f6ed3cf72059d16e4e702be01325c1f73c7 /tools | |
| parent | 7e2b1add5ffd1d726801b5f3806c7e26f493c3e9 (diff) | |
| download | rsyslog-0a5a3fba01d42ef3b380c4ae27699bb42c3af493.tar.gz | |
Imported Upstream version 5.7.2upstream/5.7.2
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/omfile.c | 6 | ||||
| -rw-r--r-- | tools/ompipe.c | 1 | ||||
| -rw-r--r-- | tools/omusrmsg.c | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 6541194..96657ad 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -36,7 +36,7 @@ rsyslogd_SOURCES = \ \ ../dirty.h rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) -rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) -lm +rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) rsyslogd_LDFLAGS = -export-dynamic if ENABLE_DIAGTOOLS diff --git a/tools/Makefile.in b/tools/Makefile.in index 3aca095..289e21b 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -327,7 +327,7 @@ rsyslogd_SOURCES = \ ../dirty.h rsyslogd_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) -rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) -lm +rsyslogd_LDADD = $(ZLIB_LIBS) $(PTHREADS_LIBS) $(RSRT_LIBS) $(SOL_LIBS) rsyslogd_LDFLAGS = -export-dynamic @ENABLE_DIAGTOOLS_TRUE@rsyslog_diag_hostname_SOURCES = gethostn.c @ENABLE_DIAGTOOLS_TRUE@zpipe_SOURCES = zpipe.c diff --git a/tools/omfile.c b/tools/omfile.c index 57089cf..78f2bf8 100644 --- a/tools/omfile.c +++ b/tools/omfile.c @@ -98,7 +98,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 } diff --git a/tools/ompipe.c b/tools/ompipe.c index cf22bc8..c51a5c4 100644 --- a/tools/ompipe.c +++ b/tools/ompipe.c @@ -42,6 +42,7 @@ #include <assert.h> #include <errno.h> #include <fcntl.h> +#include <unistd.h> #include <sys/file.h> #include "syslogd.h" diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index e788a00..e61751d 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -143,7 +143,7 @@ void setutent(void) { assert(BSD_uf == NULL); if ((BSD_uf = fopen(_PATH_UTMP, "r")) == NULL) { - errmsg.LogError(NO_ERRCODE, "%s", _PATH_UTMP); + errmsg.LogError(0, NO_ERRCODE, "%s", _PATH_UTMP); return; } } |