diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-09 16:01:32 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-01-09 16:01:32 +0100 |
commit | 2791bd82f5305c4b514ebf50e97de686961d9dd1 (patch) | |
tree | d8193715d8a2f4c6f8132bc85ff5790aefe1c386 /runtime/net.c | |
parent | ae4f1c56d9497236023e7be8f2d1d8050aa41068 (diff) | |
parent | 8a344f0ba6938591dc91a5fc2218eaa89c6fecd6 (diff) | |
download | rsyslog-2791bd82f5305c4b514ebf50e97de686961d9dd1.tar.gz rsyslog-2791bd82f5305c4b514ebf50e97de686961d9dd1.tar.bz2 rsyslog-2791bd82f5305c4b514ebf50e97de686961d9dd1.zip |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/net.c')
-rw-r--r-- | runtime/net.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/net.c b/runtime/net.c index dcf9cb52..1a8f2438 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -54,7 +54,11 @@ #include <fnmatch.h> #include <fcntl.h> #include <unistd.h> +#if HAVE_GETIFADDRS #include <ifaddrs.h> +#else +#include "compat/ifaddrs.h" +#endif /* HAVE_GETIFADDRS */ #include <sys/types.h> #include <arpa/inet.h> |