components/python/python26/patches/Python26-17-netpacket-packet-h.patch
branchs11u3-sru
changeset 7811 9126e6f58cd8
parent 7792 ee802f9b5132
child 7816 79ee06fdecc5
--- a/components/python/python26/patches/Python26-17-netpacket-packet-h.patch	Wed Mar 22 09:27:09 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-diff --git Python-2.6.4/Modules/socketmodule.c Python-2.6.4/Modules/socketmodule.c
---- Python-2.6.4/Modules/socketmodule.c
-+++ Python-2.6.4/Modules/socketmodule.c
-@@ -81,6 +81,14 @@
- 
- */
- 
-+#ifdef HAVE_NETPACKET_PACKET_H
-+#ifdef sun
-+#define USE_NETPACKET_PACKET_H 0
-+#else
-+#define USE_NETPACKET_PACKET_H 1
-+#endif
-+#endif
-+
- #ifdef __APPLE__
-   /*
-    * inet_aton is not available on OSX 10.3, yet we want to use a binary
-@@ -1096,7 +1104,7 @@
-         }
- #endif
- 
--#ifdef HAVE_NETPACKET_PACKET_H
-+#if USE_NETPACKET_PACKET_H
-     case AF_PACKET:
-     {
-         struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
-@@ -1387,7 +1395,7 @@
-     }
- #endif
- 
--#ifdef HAVE_NETPACKET_PACKET_H
-+#if USE_NETPACKET_PACKET_H
-     case AF_PACKET:
-     {
-         struct sockaddr_ll* addr;
-@@ -1564,7 +1572,7 @@
-     }
- #endif
- 
--#ifdef HAVE_NETPACKET_PACKET_H
-+#if USE_NETPACKET_PACKET_H
-     case AF_PACKET:
-     {
-         *len_ret = sizeof (struct sockaddr_ll);
-@@ -4599,7 +4607,7 @@
-     PyModule_AddStringConstant(m, "BDADDR_LOCAL", "00:00:00:FF:FF:FF");
- #endif
- 
--#ifdef HAVE_NETPACKET_PACKET_H
-+#if USE_NETPACKET_PACKET_H
-     PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET);
-     PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET);
-     PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST);