Commit b6150698 authored by Christian Heimes's avatar Christian Heimes

Fix for VS 2008

Although WS2_32.dll doesn't have inet_pton the definition conflicts with ws2tcpip.h.
parent 65f9aced
......@@ -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
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