Adjust WIN32 freeaddrinfo, getaddrinfo and getnameinfo availability

diff --git a/ares/config-win32.h b/ares/config-win32.h
index 7a7adb640824d0130f1e86151bcef657f9802dce..9e8f10c557709c196fd42581d664e19ffd187b30 100644 (file)
--- 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 b782631ded8578e3a816a5c23ae4d7f7eb28d014..88d0118496be0026f482dd1b0608907d5a2bc3b9 100644 (file)
--- 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 61471a323e52f2ecd31f199eebde65db8b2cab49..8b18bd5c030e21179af7125974156c55f9322488 100644 (file)
--- 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