10139N/A--- Python-2.4.6/Modules/socketmodule.c.packet 2006-10-11 05:20:41.000000000 +1300

10139N/A+++ Python-2.4.6/Modules/socketmodule.c 2009-12-01 21:23:57.240536116 +1300

10139N/A@@ -61,6 +61,14 @@

18175N/A

10139N/A */

10139N/A

10139N/A+#ifdef HAVE_NETPACKET_PACKET_H

17185N/A+#ifdef sun

10139N/A+#define USE_NETPACKET_PACKET_H 0

17180N/A+#else

17180N/A+#define USE_NETPACKET_PACKET_H 1

17180N/A+#endif

12285N/A+#endif

10139N/A+

10139N/A #ifdef __APPLE__

10139N/A /*

17394N/A * inet_aton is not available on OSX 10.3, yet we want to use a binary

13494N/A@@ -1077,7 +1085,7 @@

10139N/A }

10139N/A #endif

10139N/A

17394N/A-#ifdef HAVE_NETPACKET_PACKET_H

10139N/A+#if USE_NETPACKET_PACKET_H

12285N/A case AF_PACKET:

12773N/A {

12773N/A struct sockaddr_ll *a = (struct sockaddr_ll *)addr;

12773N/A@@ -1278,7 +1286,7 @@

13368N/A }

18111N/A #endif

10139N/A

10737N/A-#ifdef HAVE_NETPACKET_PACKET_H

11419N/A+#if USE_NETPACKET_PACKET_H

17733N/A case AF_PACKET:

10139N/A {

13494N/A struct sockaddr_ll* addr;

11419N/A@@ -1388,7 +1396,7 @@

11895N/A }

13494N/A #endif

10737N/A

13494N/A-#ifdef HAVE_NETPACKET_PACKET_H

11420N/A+#if USE_NETPACKET_PACKET_H

11044N/A case AF_PACKET:

13494N/A {

11420N/A *len_ret = sizeof (struct sockaddr_ll);

13368N/A@@ -4099,7 +4107,7 @@

16081N/A PyModule_AddObject(m, "BDADDR_LOCAL", Py_BuildValue("s", "00:00:00:FF:FF:FF"));

15306N/A #endif

16081N/A

13494N/A-#ifdef HAVE_NETPACKET_PACKET_H

16081N/A+#if USE_NETPACKET_PACKET_H

16445N/A PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET);

16081N/A PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET);

14281N/A PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST);

14127N/A