summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2002-03-01 08:31:07 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2002-03-01 08:31:07 (GMT)
commit272cb40e31fd2eb194509bcc028998d324ba42c2 (patch)
treed5ac74392f35109c121c5f6d18fe8df687e80e39 /Modules
parent31e233aa7a02ed8e95227527223db947567830b4 (diff)
downloadcpython-272cb40e31fd2eb194509bcc028998d324ba42c2.zip
cpython-272cb40e31fd2eb194509bcc028998d324ba42c2.tar.gz
cpython-272cb40e31fd2eb194509bcc028998d324ba42c2.tar.bz2
Patch #520062: Support IPv6 with VC.NET.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/socketmodule.c3
-rw-r--r--Modules/socketmodule.h10
2 files changed, 13 insertions, 0 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 2f954a9..92b8d4b 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -409,8 +409,11 @@ PyGAI_Err(int error)
{
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
v = Py_BuildValue("(is)", error, gai_strerror(error));
diff --git a/Modules/socketmodule.h b/Modules/socketmodule.h
index d1503ba..a59e6f7 100644
--- a/Modules/socketmodule.h
+++ b/Modules/socketmodule.h
@@ -9,8 +9,18 @@
# endif
#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
#ifdef HAVE_SYS_UN_H
# include <sys/un.h>