diff options
| author | Guillem Jover <guillem@debian.org> | 2012-11-14 09:21:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-14 09:21:24 +0100 |
| commit | 9c62c6b227bd98f6d26610ce0461124518731d0f (patch) | |
| tree | 1d27f6d16b88492303ddabe585750fc9487fa795 | |
| parent | 0aa6afbc501611e2e0d0453b15e901344dfa6157 (diff) | |
| download | rsyslog-9c62c6b227bd98f6d26610ce0461124518731d0f.tar.gz rsyslog-9c62c6b227bd98f6d26610ce0461124518731d0f.tar.bz2 rsyslog-9c62c6b227bd98f6d26610ce0461124518731d0f.zip | |
bugfix: make rsyslog compile on kfreebsd again
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | plugins/imkmsg/kmsg.c | 2 | ||||
| -rw-r--r-- | runtime/msg.c | 4 |
4 files changed, 8 insertions, 3 deletions
@@ -27,6 +27,9 @@ Version 7.2.2 [v7-stable] 2012-10-?? closes: http://bugzilla.adiscon.com/show_bug.cgi?id=376 The testbench was also enhanced to check for these cases. Thanks to Georgi Georgiev for the bug report. +- bugfix: make rsyslog compile on kfreebsd again + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380 + Thanks to Guillem Jover for the patch. ---------------------------------------------------------------------------- Version 7.2.1 [v7-stable] 2012-10-29 - bugfix: ruleset()-object did only support a single statement diff --git a/configure.ac b/configure.ac index 270eca5f..91571719 100644 --- a/configure.ac +++ b/configure.ac @@ -114,7 +114,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRERROR_R AC_FUNC_VPRINTF -AC_CHECK_FUNCS([flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync lseek64]) +AC_CHECK_FUNCS([flock basename alarm clock_gettime gethostbyname gethostname gettimeofday localtime_r memset mkdir regcomp select setid socket strcasecmp strchr strdup strerror strndup strnlen strrchr strstr strtol strtoul sysinfo uname ttyname_r getline malloc_trim prctl epoll_create epoll_create1 fdatasync lseek64]) # the check below is probably ugly. If someone knows how to do it in a better way, please # let me know! -- rgerhards, 2010-10-06 diff --git a/plugins/imkmsg/kmsg.c b/plugins/imkmsg/kmsg.c index 9ad98da4..b771d68a 100644 --- a/plugins/imkmsg/kmsg.c +++ b/plugins/imkmsg/kmsg.c @@ -32,7 +32,9 @@ #include <errno.h> #include <string.h> #include <ctype.h> +#ifdef OS_LINUX #include <sys/klog.h> +#endif #include <json/json.h> #include "rsyslog.h" diff --git a/runtime/msg.c b/runtime/msg.c index 1318de22..b627cd59 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2883,8 +2883,8 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, *pbMustBeFreed = 0; break; case PROP_SYS_UPTIME: -# ifdef OS_SOLARIS - pRes = (uchar*) "UPTIME NOT available under Solaris"; +# ifndef HAVE_SYSINFO + pRes = (uchar*) "UPTIME NOT available on this system"; *pbMustBeFreed = 0; # else { |