summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-06-05 18:30:07 +0000
committerGerald Carter <jerry@samba.org>2002-06-05 18:30:07 +0000
commitaed3d69bc5f13d011d91b6abcc164b592bebbbaa (patch)
tree4d5c4949d7003ce07b4f55f3bccadfb95c144d2e /source3/lib
parentcef94845806338fb6f09ddce0877c7430fc5d0e9 (diff)
downloadsamba-aed3d69bc5f13d011d91b6abcc164b592bebbbaa.tar.gz
samba-aed3d69bc5f13d011d91b6abcc164b592bebbbaa.tar.bz2
samba-aed3d69bc5f13d011d91b6abcc164b592bebbbaa.zip
merge from 2.2
(This used to be commit ce2ddb70411b30a0d6b2d6dded13c3b94895c1dd)
Diffstat (limited to 'source3/lib')
-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