diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2019-03-03 10:00:26 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2019-03-03 10:00:26 +0000 |
| commit | 9784899d58a41ae0f92793e6ceb7fc0e7b0c1b1e (patch) | |
| tree | ec88c08f05dc74a9d6346576fd853e560fb434c3 /usr.sbin/syslogd | |
| parent | 27a1e609848469741cde330a8c0258abd1a6aa82 (diff) | |
| download | src-9784899d58a41ae0f92793e6ceb7fc0e7b0c1b1e.tar.gz src-9784899d58a41ae0f92793e6ceb7fc0e7b0c1b1e.zip | |
Fix compilation of world with WITHOUT_{INET,INET6}_SUPPORT or both set.
Buildworld failed when both WITHOUT_INET6_SUPPORT and INET equivalent were set.
Fix netstat and syslogd by applying appropriate #ifdef INET/INET6 to make world
compile again.
Reviewed by: ngie, hrs, ume
Welcomed by: Michael Dexter (D17040)
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D19418
Notes
Notes:
svn path=/head/; revision=344740
Diffstat (limited to 'usr.sbin/syslogd')
| -rw-r--r-- | usr.sbin/syslogd/syslogd.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index b858b328a74a..2a2cafa6ae9b 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1619,6 +1619,7 @@ iovlist_append(struct iovlist *il, const char *str) } } +#if defined(INET) || defined(INET6) static void iovlist_truncate(struct iovlist *il, size_t size) { @@ -1639,6 +1640,7 @@ iovlist_truncate(struct iovlist *il, size_t size) } } } +#endif static void fprintlog_write(struct filed *f, struct iovlist *il, int flags) @@ -2959,7 +2961,11 @@ timedout(int sig __unused) * Returns -1 on error, 0 if the argument was valid. */ static int +#if defined(INET) || defined(INET6) allowaddr(char *s) +#else +allowaddr(char *s __unused) +#endif { #if defined(INET) || defined(INET6) char *cp1, *cp2; @@ -3121,13 +3127,13 @@ allowaddr(char *s) } printf("port = %d\n", ap->port); } -#endif return (0); err: if (res != NULL) freeaddrinfo(res); free(ap); +#endif return (-1); } |