From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sun, 15 May 2011 11:16:22 +0000 (+0200)
Subject: Fix _socket compilation failures on non-Linux buildbots (cf. issue #1746656).
X-Git-Tag: v3.3.0a1~2266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d74b5936a1e3ded828fbc243b9de9da47af5af92;p=thirdparty%2FPython%2Fcpython.git

Fix _socket compilation failures on non-Linux buildbots (cf. issue #1746656).
---

diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index f064795b80f2..db44fd368d35 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -59,9 +59,12 @@ typedef int socklen_t;
 #include <bluetooth.h>
 #endif
 
+#ifdef HAVE_NET_IF_H
+# include <net/if.h>
+#endif
+
 #ifdef HAVE_NETPACKET_PACKET_H
 # include <sys/ioctl.h>
-# include <net/if.h>
 # include <netpacket/packet.h>
 #endif
 
diff --git a/configure b/configure
index ae9edce2cb02..d5506efd9424 100755
--- a/configure
+++ b/configure
@@ -6037,7 +6037,7 @@ sys/lock.h sys/mkdev.h sys/modem.h \
 sys/param.h sys/poll.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \
 sys/stat.h sys/termio.h sys/time.h \
 sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \
-libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
+libutil.h sys/resource.h net/if.h netpacket/packet.h sysexits.h bluetooth.h \
 bluetooth/bluetooth.h linux/tipc.h spawn.h util.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/configure.in b/configure.in
index 52f07e6e0760..3ae9a34ffe17 100644
--- a/configure.in
+++ b/configure.in
@@ -1293,7 +1293,7 @@ sys/lock.h sys/mkdev.h sys/modem.h \
 sys/param.h sys/poll.h sys/select.h sys/sendfile.h sys/socket.h sys/statvfs.h \
 sys/stat.h sys/termio.h sys/time.h \
 sys/times.h sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/wait.h pty.h \
-libutil.h sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
+libutil.h sys/resource.h net/if.h netpacket/packet.h sysexits.h bluetooth.h \
 bluetooth/bluetooth.h linux/tipc.h spawn.h util.h)
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
diff --git a/pyconfig.h.in b/pyconfig.h.in
index b24c4b00bfb1..95d71c9c7fb8 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -539,6 +539,9 @@
 /* Define to 1 if you have the <netpacket/packet.h> header file. */
 #undef HAVE_NETPACKET_PACKET_H
 
+/* Define to 1 if you have the <net/if.h> header file. */
+#undef HAVE_NET_IF_H
+
 /* Define to 1 if you have the `nice' function. */
 #undef HAVE_NICE