From: Yang Tse Date: Sat, 1 Nov 2008 17:13:10 +0000 (+0000) Subject: Adjust WIN32 freeaddrinfo, getaddrinfo and getnameinfo availability X-Git-Tag: curl-7_19_1~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=128418b214dbb38ea1b8d08d6641ae9cbe43921f;p=thirdparty%2Fcurl.git Adjust WIN32 freeaddrinfo, getaddrinfo and getnameinfo availability --- diff --git a/ares/config-win32.h b/ares/config-win32.h index 7a7adb6408..9e8f10c557 100644 --- a/ares/config-win32.h +++ b/ares/config-win32.h @@ -225,11 +225,11 @@ /* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite */ /* convoluted, compiler dependant and in some cases even build target dependat. */ #if defined(HAVE_WS2TCPIP_H) -# if defined(_MSC_VER) && (_MSC_VER >= 1200) +# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETNAMEINFO 1 -# elif defined(__MINGW32__) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) +# elif defined(_MSC_VER) && (_MSC_VER >= 1200) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETNAMEINFO 1 diff --git a/lib/config-win32.h b/lib/config-win32.h index b782631ded..88d0118496 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -393,11 +393,11 @@ /* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite */ /* convoluted, compiler dependant and in some cases even build target dependat. */ #if defined(HAVE_WS2TCPIP_H) -# if defined(_MSC_VER) && (_MSC_VER >= 1200) +# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETNAMEINFO 1 -# elif defined(__MINGW32__) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) +# elif defined(_MSC_VER) && (_MSC_VER >= 1200) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETNAMEINFO 1 diff --git a/src/config-win32.h b/src/config-win32.h index 61471a323e..8b18bd5c03 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -247,11 +247,11 @@ /* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite */ /* convoluted, compiler dependant and in some cases even build target dependat. */ #if defined(HAVE_WS2TCPIP_H) -# if defined(_MSC_VER) && (_MSC_VER >= 1200) +# if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETNAMEINFO 1 -# elif defined(__MINGW32__) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501) +# elif defined(_MSC_VER) && (_MSC_VER >= 1200) # define HAVE_FREEADDRINFO 1 # define HAVE_GETADDRINFO 1 # define HAVE_GETNAMEINFO 1