[Python-checkins] r85870 - in python/branches/release27-maint: Misc/NEWS Modules/socketmodule.c
antoine.pitrou
python-checkins at python.org
Wed Oct 27 22:35:26 CEST 2010
Author: antoine.pitrou
Date: Wed Oct 27 22:35:26 2010
New Revision: 85870
Log:
Merged revisions 85868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r85868 | antoine.pitrou | 2010-10-27 22:13:57 +0200 (mer., 27 oct. 2010) | 3 lines
Issue #8852: Allow the socket module to build on OpenSolaris.
........
Modified:
python/branches/release27-maint/ (props changed)
python/branches/release27-maint/Misc/NEWS
python/branches/release27-maint/Modules/socketmodule.c
Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS (original)
+++ python/branches/release27-maint/Misc/NEWS Wed Oct 27 22:35:26 2010
@@ -411,6 +411,8 @@
Build
-----
+- Issue #8852: Allow the socket module to build on OpenSolaris.
+
- Issue #10054: Some platforms provide uintptr_t in inttypes.h. Patch by
Akira Kitada.
Modified: python/branches/release27-maint/Modules/socketmodule.c
==============================================================================
--- python/branches/release27-maint/Modules/socketmodule.c (original)
+++ python/branches/release27-maint/Modules/socketmodule.c Wed Oct 27 22:35:26 2010
@@ -1102,7 +1102,7 @@
}
#endif
-#ifdef HAVE_NETPACKET_PACKET_H
+#if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFNAME)
case AF_PACKET:
{
struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
@@ -1418,7 +1418,7 @@
}
#endif
-#ifdef HAVE_NETPACKET_PACKET_H
+#if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFINDEX)
case AF_PACKET:
{
struct sockaddr_ll* addr;
@@ -4678,16 +4678,32 @@
PyModule_AddStringConstant(m, "BDADDR_LOCAL", "00:00:00:FF:FF:FF");
#endif
-#ifdef HAVE_NETPACKET_PACKET_H
- PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET);
- PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET);
- PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST);
- PyModule_AddIntConstant(m, "PACKET_BROADCAST", PACKET_BROADCAST);
- PyModule_AddIntConstant(m, "PACKET_MULTICAST", PACKET_MULTICAST);
- PyModule_AddIntConstant(m, "PACKET_OTHERHOST", PACKET_OTHERHOST);
- PyModule_AddIntConstant(m, "PACKET_OUTGOING", PACKET_OUTGOING);
- PyModule_AddIntConstant(m, "PACKET_LOOPBACK", PACKET_LOOPBACK);
- PyModule_AddIntConstant(m, "PACKET_FASTROUTE", PACKET_FASTROUTE);
+#ifdef AF_PACKET
+ PyModule_AddIntMacro(m, AF_PACKET);
+#endif
+#ifdef PF_PACKET
+ PyModule_AddIntMacro(m, PF_PACKET);
+#endif
+#ifdef PACKET_HOST
+ PyModule_AddIntMacro(m, PACKET_HOST);
+#endif
+#ifdef PACKET_BROADCAST
+ PyModule_AddIntMacro(m, PACKET_BROADCAST);
+#endif
+#ifdef PACKET_MULTICAST
+ PyModule_AddIntMacro(m, PACKET_MULTICAST);
+#endif
+#ifdef PACKET_OTHERHOST
+ PyModule_AddIntMacro(m, PACKET_OTHERHOST);
+#endif
+#ifdef PACKET_OUTGOING
+ PyModule_AddIntMacro(m, PACKET_OUTGOING);
+#endif
+#ifdef PACKET_LOOPBACK
+ PyModule_AddIntMacro(m, PACKET_LOOPBACK);
+#endif
+#ifdef PACKET_FASTROUTE
+ PyModule_AddIntMacro(m, PACKET_FASTROUTE);
#endif
#ifdef HAVE_LINUX_TIPC_H
More information about the Python-checkins
mailing list