[Python-3000-checkins] r59002 - python/branches/py3k/Modules/socketmodule.c

[christian.heimes]

Author: christian.heimes
Date: Fri Nov 16 00:37:07 2007
New Revision: 59002

Modified:
   python/branches/py3k/Modules/socketmodule.c
Log:
Fix for VS 2008
Although WS2_32.dll doesn't have inet_pton the definition conflicts with ws2tcpip.h.

Modified: python/branches/py3k/Modules/socketmodule.c
==============================================================================
--- python/branches/py3k/Modules/socketmodule.c	(original)
+++ python/branches/py3k/Modules/socketmodule.c	Fri Nov 16 00:37:07 2007
@@ -285,9 +285,12 @@
 #endif
 
 #ifndef HAVE_INET_PTON
+#if !(defined(_MSC_VER) && _MSC_VER>1499)
+/* Don't redefine inet_pton in VS2008 */
 int inet_pton(int af, const char *src, void *dst);
 const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
 #endif
+#endif
 
 #ifdef __APPLE__
 /* On OS X, getaddrinfo returns no error indication of lookup
@@ -4868,6 +4871,8 @@
 
 
 #ifndef HAVE_INET_PTON
+#if !(defined(_MSC_VER) && _MSC_VER>1499)
+/* Don't redefine inet_pton in VS2008 */
 
 /* Simplistic emulation code for inet_pton that only works for IPv4 */
 /* These are not exposed because they do not set errno properly */
@@ -4903,3 +4908,4 @@
 }
 
 #endif
+#endif