From b61506989edc59736910434079f9247a0d57e945 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 15 Nov 2007 23:37:07 +0000 Subject: [PATCH] Fix for VS 2008 Although WS2_32.dll doesn't have inet_pton the definition conflicts with ws2tcpip.h. --- Modules/socketmodule.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 78aeb558fc..2621a9eb72 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -285,9 +285,12 @@ typedef size_t socklen_t; #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 @@ init_socket(void) #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 @@ inet_ntop(int af, const void *src, char *dst, socklen_t size) } #endif +#endif -- 2.49.0