[Python-checkins] CVS: python/dist/src/Modules socketmodule.c,1.208,1.209 socketmodule.h,1.4,1.5

Martin v. L?wis loewis@users.sourceforge.net
Fri, 01 Mar 2002 00:31:09 -0800


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

Modified Files:
	socketmodule.c socketmodule.h 
Log Message:
Patch #520062: Support IPv6 with VC.NET.


Index: socketmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** socketmodule.c	17 Feb 2002 04:13:21 -0000	1.208
--- socketmodule.c	1 Mar 2002 08:31:07 -0000	1.209
***************
*** 410,415 ****
--- 410,418 ----
  	PyObject *v;
  
+ #ifdef EAI_SYSTEM
+ 	/* EAI_SYSTEM is not available on Windows XP. */
  	if (error == EAI_SYSTEM)
  		return PySocket_Err();
+ #endif
  
  #ifdef HAVE_GAI_STRERROR

Index: socketmodule.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** socketmodule.h	25 Feb 2002 14:45:40 -0000	1.4
--- socketmodule.h	1 Mar 2002 08:31:07 -0000	1.5
***************
*** 10,14 ****
--- 10,24 ----
  
  #else /* MS_WINDOWS */
+ #if _MSC_VER >= 1300
+ # include <winsock2.h>
+ # include <ws2tcpip.h>
+ # define HAVE_ADDRINFO
+ # define HAVE_SOCKADDR_STORAGE
+ # define HAVE_GETADDRINFO
+ # define HAVE_GETNAMEINFO
+ # define ENABLE_IPV6
+ #else
  # include <winsock.h>
+ #endif
  #endif