svn commit: samba r18589 - in branches/SAMBA_4_0/source/lib/socket: .

tridge at samba.org tridge at samba.org
Sat Sep 16 20:52:58 GMT 2006


Author: tridge
Date: 2006-09-16 20:52:57 +0000 (Sat, 16 Sep 2006)
New Revision: 18589

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18589

Log:

make inclusion of net/if.h conditional. It breaks HPUX with gcc.

Modified:
   branches/SAMBA_4_0/source/lib/socket/netif.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket/netif.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/netif.c	2006-09-16 19:27:51 UTC (rev 18588)
+++ branches/SAMBA_4_0/source/lib/socket/netif.c	2006-09-16 20:52:57 UTC (rev 18589)
@@ -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"
 



More information about the samba-cvs mailing list