From: Yang Tse <yangsita@gmail.com>
Date: Sat, 1 Nov 2008 16:52:57 +0000 (+0000)
Subject: WIN32 availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite
X-Git-Tag: curl-7_19_1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=050a39a7a578106989b32f80a625c46a87b52ca1;p=thirdparty%2Fcurl.git

WIN32 availability of freeaddrinfo, getaddrinfo and getnameinfo functions is quite
convoluted, compiler dependant and in some cases even build target dependat.
---

diff --git a/ares/config-win32.h b/ares/config-win32.h
index 6e548dcdfa..7a7adb6408 100644
--- a/ares/config-win32.h
+++ b/ares/config-win32.h
@@ -222,6 +222,20 @@
 #  endif
 #endif
 
+/* 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)
+#    define HAVE_FREEADDRINFO 1
+#    define HAVE_GETADDRINFO  1
+#    define HAVE_GETNAMEINFO  1
+#  elif defined(__MINGW32__) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
+#    define HAVE_FREEADDRINFO 1
+#    define HAVE_GETADDRINFO  1
+#    define HAVE_GETNAMEINFO  1
+#  endif
+#endif
+
 /* ---------------------------------------------------------------- */
 /*                         IPV6 COMPATIBILITY                       */
 /* ---------------------------------------------------------------- */
diff --git a/lib/config-win32.h b/lib/config-win32.h
index 5ac22b9ef1..b782631ded 100644
--- a/lib/config-win32.h
+++ b/lib/config-win32.h
@@ -219,16 +219,6 @@
 #define HAVE_UTIME 1
 #endif
 
-/* The following 2 functions are strictly only available when
- * _WIN32_WINNT is 0x0501 or larger. But we assume this value
- * is defined. See below. */
-
-/* Define if you have the getaddrinfo function. */
-#define HAVE_GETADDRINFO 1
-
-/* Define if you have the getnameinfo function. */
-#define HAVE_GETNAMEINFO 1
-
 /* Define to the type qualifier of arg 1 for getnameinfo. */
 #define GETNAMEINFO_QUAL_ARG1 const
 
@@ -400,6 +390,20 @@
 #  endif
 #endif
 
+/* 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)
+#    define HAVE_FREEADDRINFO 1
+#    define HAVE_GETADDRINFO  1
+#    define HAVE_GETNAMEINFO  1
+#  elif defined(__MINGW32__) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
+#    define HAVE_FREEADDRINFO 1
+#    define HAVE_GETADDRINFO  1
+#    define HAVE_GETNAMEINFO  1
+#  endif
+#endif
+
 /* ---------------------------------------------------------------- */
 /*                        LARGE FILE SUPPORT                        */
 /* ---------------------------------------------------------------- */
diff --git a/src/config-win32.h b/src/config-win32.h
index c32ab17171..61471a323e 100644
--- a/src/config-win32.h
+++ b/src/config-win32.h
@@ -244,6 +244,20 @@
 #  endif
 #endif
 
+/* 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)
+#    define HAVE_FREEADDRINFO 1
+#    define HAVE_GETADDRINFO  1
+#    define HAVE_GETNAMEINFO  1
+#  elif defined(__MINGW32__) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0501)
+#    define HAVE_FREEADDRINFO 1
+#    define HAVE_GETADDRINFO  1
+#    define HAVE_GETNAMEINFO  1
+#  endif
+#endif
+
 /* ---------------------------------------------------------------- */
 /*                        LARGE FILE SUPPORT                        */
 /* ---------------------------------------------------------------- */