summaryrefslogtreecommitdiff
path: root/source3/lib/interfaces.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-07-15 10:35:28 +0000
committerAndrew Tridgell <tridge@samba.org>2002-07-15 10:35:28 +0000
commite90b65284812aaa5ff9e9935ce9bbad7791cbbcd (patch)
tree9e744d1dc2f93934a4b49166a37383d3cb2b2139 /source3/lib/interfaces.c
parentec167dc9cc0ec2ee461837c25a371d2981744208 (diff)
downloadsamba-e90b65284812aaa5ff9e9935ce9bbad7791cbbcd.tar.gz
samba-e90b65284812aaa5ff9e9935ce9bbad7791cbbcd.tar.bz2
samba-e90b65284812aaa5ff9e9935ce9bbad7791cbbcd.zip
updated the 3.0 branch from the head branch - ready for alpha18
(This used to be commit 03ac082dcb375b6f3ca3d810a6a6367542bc23ce)
Diffstat (limited to 'source3/lib/interfaces.c')
-rw-r--r--source3/lib/interfaces.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/source3/lib/interfaces.c b/source3/lib/interfaces.c
index 7b8ef0d0c1..96f4b4cd94 100644
--- a/source3/lib/interfaces.c
+++ b/source3/lib/interfaces.c
@@ -41,10 +41,6 @@
#include <sys/time.h>
#include <net/if.h>
-#ifndef SIOCGIFCONF
-#include <sys/sockio.h>
-#endif
-
#ifdef AUTOCONF_TEST
struct iface_struct {
char name[16];
@@ -56,6 +52,16 @@ struct iface_struct {
#include "interfaces.h"
#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifndef SIOCGIFCONF
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+#endif
+
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif