diff options
| author | Nadeem Vawda <nadeem.vawda@gmail.com> | 2011-05-15 11:16:22 (GMT) |
|---|---|---|
| committer | Nadeem Vawda <nadeem.vawda@gmail.com> | 2011-05-15 11:16:22 (GMT) |
| commit | d74b5936a1e3ded828fbc243b9de9da47af5af92 (patch) | |
| tree | d73fee262da903c82887b7ff184d3fd33004cec8 | |
| parent | aedb2823fd740dcdf64744d47eab0053324741b1 (diff) | |
| download | cpython-d74b5936a1e3ded828fbc243b9de9da47af5af92.zip cpython-d74b5936a1e3ded828fbc243b9de9da47af5af92.tar.gz cpython-d74b5936a1e3ded828fbc243b9de9da47af5af92.tar.bz2 | |
Fix _socket compilation failures on non-Linux buildbots (cf. issue #1746656).
| -rw-r--r-- | Modules/socketmodule.h | 5 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | pyconfig.h.in | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h index f064795..db44fd3 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 @@ -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 52f07e6..3ae9a34 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 b24c4b0..95d71c9 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 |