mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #8852: Allow the socket module to build on OpenSolaris.

Browse source
This commit is contained in:
Antoine Pitrou 2010-10-27 20:13:57 +00:00
parent 71f8cc9b4a
commit b156a46b26
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -184,6 +184,8 @@ Tests
Build Build
----- -----
- Issue #8852: Allow the socket module to build on OpenSolaris.
- Drop -OPT:Olimit compiler option. - Drop -OPT:Olimit compiler option.
- Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd. - Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd.

40
Modules/socketmodule.c
View file

@ -1139,7 +1139,7 @@ makesockaddr(SOCKET_T sockfd, struct sockaddr *addr, size_t addrlen, int proto)
} }
#endif #endif
#ifdef HAVE_NETPACKET_PACKET_H #if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFNAME)
case AF_PACKET: case AF_PACKET:
{ {
struct sockaddr_ll *a = (struct sockaddr_ll *)addr; struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
@ -1455,7 +1455,7 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
} }
#endif #endif
#ifdef HAVE_NETPACKET_PACKET_H #if defined(HAVE_NETPACKET_PACKET_H) && defined(SIOCGIFINDEX)
case AF_PACKET: case AF_PACKET:
{ {
struct sockaddr_ll* addr; struct sockaddr_ll* addr;
@ -4569,16 +4569,32 @@ PyInit__socket(void)
PyModule_AddStringConstant(m, "BDADDR_LOCAL", "00:00:00:FF:FF:FF"); PyModule_AddStringConstant(m, "BDADDR_LOCAL", "00:00:00:FF:FF:FF");
#endif #endif
#ifdef HAVE_NETPACKET_PACKET_H #ifdef AF_PACKET
PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET); PyModule_AddIntMacro(m, AF_PACKET);
PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET); #endif
PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST); #ifdef PF_PACKET
PyModule_AddIntConstant(m, "PACKET_BROADCAST", PACKET_BROADCAST); PyModule_AddIntMacro(m, PF_PACKET);
PyModule_AddIntConstant(m, "PACKET_MULTICAST", PACKET_MULTICAST); #endif
PyModule_AddIntConstant(m, "PACKET_OTHERHOST", PACKET_OTHERHOST); #ifdef PACKET_HOST
PyModule_AddIntConstant(m, "PACKET_OUTGOING", PACKET_OUTGOING); PyModule_AddIntMacro(m, PACKET_HOST);
PyModule_AddIntConstant(m, "PACKET_LOOPBACK", PACKET_LOOPBACK); #endif
PyModule_AddIntConstant(m, "PACKET_FASTROUTE", PACKET_FASTROUTE); #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 #endif
#ifdef HAVE_LINUX_TIPC_H #ifdef HAVE_LINUX_TIPC_H