diff options
| -rw-r--r-- | ares/config-win32.h | 14 | ||||
| -rw-r--r-- | lib/config-win32.h | 24 | ||||
| -rw-r--r-- | src/config-win32.h | 14 |
3 files changed, 42 insertions, 10 deletions
diff --git a/ares/config-win32.h b/ares/config-win32.h index 6e548dcdf..7a7adb640 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 5ac22b9ef..b782631de 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 c32ab1717..61471a323 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 */ /* ---------------------------------------------------------------- */ |