[Python-checkins] CVS: python/dist/src/Modules socketmodule.c,1.162,1.163

[Martin v. L?wis]

Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv27366/Modules

Modified Files:
	socketmodule.c 
Log Message:
Autotest for netpacket/packet.h, as it is not available on all Linux versions.
Depend AF_PACKET on HAVE_NETPACKET_PACKET_H.


Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** socketmodule.c	2001/08/04 22:37:23	1.162
--- socketmodule.c	2001/08/10 20:29:40	1.163
***************
*** 180,184 ****
  #endif
  
! #if defined(linux) && defined(AF_PACKET)
  #include <sys/ioctl.h>
  #include <net/if.h>
--- 180,184 ----
  #endif
  
! #ifdef HAVE_NETPACKET_PACKET_H
  #include <sys/ioctl.h>
  #include <net/if.h>
***************
*** 477,481 ****
  		struct sockaddr_storage storage;
  #endif
! #if defined(linux) && defined(AF_PACKET)
  		struct sockaddr_ll ll;
  #endif
--- 477,481 ----
  		struct sockaddr_storage storage;
  #endif
! #ifdef HAVE_NETPACKET_PACKET_H
  		struct sockaddr_ll ll;
  #endif
***************
*** 716,720 ****
  #endif
  
! #if defined(linux) && defined(AF_PACKET)
  	case AF_PACKET:
  	{
--- 716,720 ----
  #endif
  
! #ifdef HAVE_NETPACKET_PACKET_H
  	case AF_PACKET:
  	{
***************
*** 829,833 ****
  #endif
  
! #if defined(linux) && defined(AF_PACKET)
  	case AF_PACKET:
  	{
--- 829,833 ----
  #endif
  
! #ifdef HAVE_NETPACKET_PACKET_H
  	case AF_PACKET:
  	{
***************
*** 902,906 ****
  #endif
  
! #if defined(linux) && defined(AF_PACKET)
  	case AF_PACKET:
  	{
--- 902,906 ----
  #endif
  
! #ifdef HAVE_NETPACKET_PACKET_H
  	case AF_PACKET:
  	{
***************
*** 2984,2988 ****
  	insint(d, "AF_ROSE", AF_ROSE); /* Amateur Radio X.25 PLP */
  #endif
! #if defined(linux) && defined(AF_PACKET)
  	insint(d, "AF_PACKET", AF_PACKET);
  	insint(d, "PF_PACKET", PF_PACKET);
--- 2984,2988 ----
  	insint(d, "AF_ROSE", AF_ROSE); /* Amateur Radio X.25 PLP */
  #endif
! #ifdef HAVE_NETPACKET_PACKET_H
  	insint(d, "AF_PACKET", AF_PACKET);
  	insint(d, "PF_PACKET", PF_PACKET);