summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-16 20:52:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:53 -0500
commit3c76ac114da92cd7404d643ae5a0565e4333d703 (patch)
tree2e014bf2f19dc3799bf68fc826cd8bafe992438d
parent401f107e0c211eaff56aad69735bab75f03ff4d2 (diff)
downloadsamba-3c76ac114da92cd7404d643ae5a0565e4333d703.tar.gz
samba-3c76ac114da92cd7404d643ae5a0565e4333d703.tar.bz2
samba-3c76ac114da92cd7404d643ae5a0565e4333d703.zip
r18589: make inclusion of net/if.h conditional. It breaks HPUX with gcc.
(This used to be commit ac71f40f8ff13c422e528dd5013842aa5a5004e7)
-rw-r--r--source4/lib/socket/netif.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/lib/socket/netif.c b/source4/lib/socket/netif.c
index 7484baa681..f3df7631e0 100644
--- a/source4/lib/socket/netif.c
+++ b/source4/lib/socket/netif.c
@@ -30,6 +30,10 @@
*/
+#ifndef AUTOCONF_TEST
+#include "config.h"
+#endif
+
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
@@ -42,10 +46,6 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#ifndef AUTOCONF_TEST
-#include "config.h"
-#endif
-
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
@@ -76,7 +76,10 @@
#define QSORT_CAST (int (*)(const void *, const void *))
#endif
+#ifdef HAVE_NET_IF_H
#include <net/if.h>
+#endif
+
#define BOOL int
#include "netif.h"