diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-09-06 10:00:24 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-09-06 10:00:24 +0000 |
| commit | 69b9cbf32744d4cb5327c8baca1308a48ae96b22 (patch) | |
| tree | b1796742b98e018bd302ef8e85690fc7301b416f /source3/include | |
| parent | c9101c3b01b7a493944b1fec8612289d8dc531e7 (diff) | |
| download | samba-69b9cbf32744d4cb5327c8baca1308a48ae96b22.tar.gz samba-69b9cbf32744d4cb5327c8baca1308a48ae96b22.tar.bz2 samba-69b9cbf32744d4cb5327c8baca1308a48ae96b22.zip | |
Detect and use syslog.h or sys/syslog.h corretly. Fixes lack of prototype for
syslog() since Paul Green's POSIX patch.
(This used to be commit d3b29b0b2d2ffd5c050900ff8cae441b91f95526)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/config.h.in | 8 | ||||
| -rw-r--r-- | source3/include/includes.h | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 70c0ae2f3c..7945e49c79 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -1,4 +1,4 @@ -/* include/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* include/config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if on AIX 3. System headers sometimes define this. @@ -1090,6 +1090,9 @@ /* Define if you have the <sys/syscall.h> header file. */ #undef HAVE_SYS_SYSCALL_H +/* Define if you have the <sys/syslog.h> header file. */ +#undef HAVE_SYS_SYSLOG_H + /* Define if you have the <sys/termio.h> header file. */ #undef HAVE_SYS_TERMIO_H @@ -1108,6 +1111,9 @@ /* Define if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H +/* Define if you have the <syslog.h> header file. */ +#undef HAVE_SYSLOG_H + /* Define if you have the <termio.h> header file. */ #undef HAVE_TERMIO_H diff --git a/source3/include/includes.h b/source3/include/includes.h index b07b0c3649..945ec2cbd7 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -217,8 +217,12 @@ #include <arpa/inet.h> #include <netdb.h> -#ifdef WITH_SYSLOG +#ifdef HAVE_SYSLOG_H #include <syslog.h> +#else +#ifdef HAVE_SYS_SYSLOG_H +#include <sys/syslog.h> +#endif #endif #include <sys/file.h> |