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

[christian.heimes]

Author: christian.heimes
Date: Tue Nov 20 07:51:17 2007
New Revision: 59070

Modified:
   python/branches/py3k/Modules/socketmodule.c
Log:
The patch from weck does a better job than my original idea. Thanks!

Modified: python/branches/py3k/Modules/socketmodule.c
==============================================================================
--- python/branches/py3k/Modules/socketmodule.c	(original)
+++ python/branches/py3k/Modules/socketmodule.c	Tue Nov 20 07:51:17 2007
@@ -285,8 +285,7 @@
 #endif
 
 #ifndef HAVE_INET_PTON
-#if !(defined(_MSC_VER) && _MSC_VER>1499)
-/* Don't redefine inet_pton in VS2008 */
+#if !defined(NTDDI_VERSION) || (NTDDI_VERSION < NTDDI_LONGHORN)
 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
@@ -4805,8 +4804,7 @@
 
 
 #ifndef HAVE_INET_PTON
-#if !(defined(_MSC_VER) && _MSC_VER>1499)
-/* Don't redefine inet_pton in VS2008 */
+#if !defined(NTDDI_VERSION) || (NTDDI_VERSION < NTDDI_LONGHORN)
 
 /* Simplistic emulation code for inet_pton that only works for IPv4 */
 /* These are not exposed because they do not set errno properly */