Commit 272cb40e authored by Martin v. Löwis's avatar Martin v. Löwis

Patch #520062: Support IPv6 with VC.NET.

parent 31e233aa
...@@ -409,8 +409,11 @@ PyGAI_Err(int error) ...@@ -409,8 +409,11 @@ PyGAI_Err(int error)
{ {
PyObject *v; PyObject *v;
#ifdef EAI_SYSTEM
/* EAI_SYSTEM is not available on Windows XP. */
if (error == EAI_SYSTEM) if (error == EAI_SYSTEM)
return PySocket_Err(); return PySocket_Err();
#endif
#ifdef HAVE_GAI_STRERROR #ifdef HAVE_GAI_STRERROR
v = Py_BuildValue("(is)", error, gai_strerror(error)); v = Py_BuildValue("(is)", error, gai_strerror(error));
......
...@@ -9,8 +9,18 @@ ...@@ -9,8 +9,18 @@
# endif # endif
#else /* MS_WINDOWS */ #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> # include <winsock.h>
#endif #endif
#endif
#ifdef HAVE_SYS_UN_H #ifdef HAVE_SYS_UN_H
# include <sys/un.h> # include <sys/un.h>
......
...@@ -408,7 +408,11 @@ typedef int pid_t; ...@@ -408,7 +408,11 @@ typedef int pid_t;
/* #undef size_t */ /* #undef size_t */
/* Define to `int' if <sys/types.h> doesn't define. */ /* Define to `int' if <sys/types.h> doesn't define. */
#if _MSC_VER + 0 >= 1300
/* VC.NET typedefs socklen_t in ws2tcpip.h. */
#else
#define socklen_t int #define socklen_t int
#endif
/* Define if you have the ANSI C header files. */ /* Define if you have the ANSI C header files. */
#define STDC_HEADERS 1 #define STDC_HEADERS 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment