diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-28 18:33:08 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-28 18:33:08 +0100 |
| commit | f12a1995e42d098217fef22cba6e7158ed76e635 (patch) | |
| tree | 2be50d6ca7fcef1d6dd767962fbd8ffdaf3ca73d | |
| parent | 8750f48390262e0b75b37a43b2d66e5e1c0ca2c3 (diff) | |
| download | rsyslog-f12a1995e42d098217fef22cba6e7158ed76e635.tar.gz rsyslog-f12a1995e42d098217fef22cba6e7158ed76e635.tar.xz rsyslog-f12a1995e42d098217fef22cba6e7158ed76e635.zip | |
bugfix: fixed problem that caused compilation on FreeBSD 9.0 to fail.
bugtracker: http://bugzilla.adiscon.com/show_bug.cgi?id=181
Thanks to Christiano for reporting.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tools/omusrmsg.c | 6 |
3 files changed, 12 insertions, 2 deletions
@@ -1,5 +1,11 @@ --------------------------------------------------------------------------- Version 4.6.1 [v4-stable] (rgerhards), 2010-02-?? +- re-enabled old pipe output (using new module ompipe, built-in) after + some problems with pipes (and especially in regard to xconsole) were + discovered. Thanks to Michael Biebl for reporting the issues. +- bugfix: fixed problem that caused compilation on FreeBSD 9.0 to fail. + bugtracker: http://bugzilla.adiscon.com/show_bug.cgi?id=181 + Thanks to Christiano for reporting. --------------------------------------------------------------------------- Version 4.6.0 [v4-stable] (rgerhards), 2010-02-24 *************************************************************************** diff --git a/configure.ac b/configure.ac index 7f8f38c3..b3d84b59 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ AC_SUBST(DL_LIBS) AC_HEADER_RESOLV AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h syslog.h unistd.h utmp.h sys/epoll.h sys/prctl.h]) +AC_CHECK_HEADERS([arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git a/tools/omusrmsg.c b/tools/omusrmsg.c index 499a11dd..fe3fb4d4 100644 --- a/tools/omusrmsg.c +++ b/tools/omusrmsg.c @@ -50,7 +50,11 @@ #include <assert.h> #include <signal.h> #include <sys/param.h> -#include <utmp.h> +#ifdef HAVE_UTMP_X_H +# include <utmpx.h> +#else +# include <utmp.h> +#endif #include <unistd.h> #include <sys/uio.h> #include <sys/stat.h> |