From d1f9224f5824856339d80cf93f1bf4fcee57ce8f Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 18 Jul 2005 09:46:52 +0000
Subject: r8540: fixed network interface detection on several hosts (This used
 to be commit 777ac8496b400b0ed348995feed83c22c5b344b3)

---
 source4/lib/netif/netif.c | 8 +++++---
 source4/lib/netif/netif.h | 4 ----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'source4/lib/netif')

diff --git a/source4/lib/netif/netif.c b/source4/lib/netif/netif.c
index 2a87a7a610..b197178880 100644
--- a/source4/lib/netif/netif.c
+++ b/source4/lib/netif/netif.c
@@ -35,15 +35,15 @@
 #include <sys/types.h>
 #include <netdb.h>
 #include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
 #include <net/if.h>
 #include <netdb.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #ifndef AUTOCONF_TEST
-#include "lib/netif/netif.h"
 #include "config.h"
 #endif
 
@@ -77,6 +77,8 @@
 #define QSORT_CAST (int (*)(const void *, const void *))
 #endif
 
+#include "netif.h"
+
 #if HAVE_IFACE_IFCONF
 
 /* this works for Linux 2.2, Solaris 2.5, SunOS4, HPUX 10.20, OSF1
diff --git a/source4/lib/netif/netif.h b/source4/lib/netif/netif.h
index d25294f8c2..7efe5a9b19 100644
--- a/source4/lib/netif/netif.h
+++ b/source4/lib/netif/netif.h
@@ -20,10 +20,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 struct iface_struct {
 	char name[16];
 	struct in_addr ip;
-- 
cgit