17816N/A--- Python-2.4.6/Modules/socketmodule.c.packet 2006-10-11 05:20:41.000000000 +1300
17816N/A+++ Python-2.4.6/Modules/socketmodule.c 2009-12-01 21:23:57.240536116 +1300
17816N/A@@ -61,6 +61,14 @@
17816N/A
17816N/A */
17816N/A
17816N/A+#ifdef HAVE_NETPACKET_PACKET_H
17816N/A+#ifdef sun
17816N/A+#define USE_NETPACKET_PACKET_H 0
17816N/A+#else
17816N/A+#define USE_NETPACKET_PACKET_H 1
17816N/A+#endif
17816N/A+#endif
17816N/A+
17816N/A #ifdef __APPLE__
17816N/A /*
17816N/A * inet_aton is not available on OSX 10.3, yet we want to use a binary
17816N/A@@ -1077,7 +1085,7 @@
17816N/A }
17816N/A #endif
17816N/A
17816N/A-#ifdef HAVE_NETPACKET_PACKET_H
17816N/A+#if USE_NETPACKET_PACKET_H
17816N/A case AF_PACKET:
17816N/A {
17816N/A struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
17816N/A@@ -1278,7 +1286,7 @@
17816N/A }
17816N/A #endif
17816N/A
17816N/A-#ifdef HAVE_NETPACKET_PACKET_H
17816N/A+#if USE_NETPACKET_PACKET_H
17816N/A case AF_PACKET:
17816N/A {
17816N/A struct sockaddr_ll* addr;
17816N/A@@ -1388,7 +1396,7 @@
17816N/A }
17816N/A #endif
17816N/A
17816N/A-#ifdef HAVE_NETPACKET_PACKET_H
17816N/A+#if USE_NETPACKET_PACKET_H
17816N/A case AF_PACKET:
17816N/A {
17816N/A *len_ret = sizeof (struct sockaddr_ll);
17816N/A@@ -4099,7 +4107,7 @@
17816N/A PyModule_AddObject(m, "BDADDR_LOCAL", Py_BuildValue("s", "00:00:00:FF:FF:FF"));
17816N/A #endif
17816N/A
17816N/A-#ifdef HAVE_NETPACKET_PACKET_H
17816N/A+#if USE_NETPACKET_PACKET_H
17816N/A PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET);
17816N/A PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET);
17816N/A PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST);