From d6eb1a7b9800139669cc05e6dbdffa996d038df6 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 19 Dec 2005 05:57:17 +0000 Subject: [PATCH] Fix guard detection of _WIN32_WINNT for MingW in CURL_FUNC_GETNAMEINFO_ARGTYPES --- acinclude.m4 | 2 +- ares/acinclude.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index c7fdc2f2d..66cbdae45 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -211,7 +211,7 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ #undef inline #ifdef HAVE_WINDOWS_H #define WIN32_LEAN_AND_MEAN -#if defined(__MINGW32__) && (_WIN32_WINNT < 0x0501) +#if defined(__MINGW32__) && ( (!defined(_WIN32_WINNT)) || (_WIN32_WINNT < 0x0501) ) #undef _WIN32_WINNT #define _WIN32_WINNT 0x0501 #endif diff --git a/ares/acinclude.m4 b/ares/acinclude.m4 index 4f4e6fefc..be1e4aed2 100644 --- a/ares/acinclude.m4 +++ b/ares/acinclude.m4 @@ -211,7 +211,7 @@ AC_DEFUN([CURL_FUNC_GETNAMEINFO_ARGTYPES], [ #undef inline #ifdef HAVE_WINDOWS_H #define WIN32_LEAN_AND_MEAN -#if defined(__MINGW32__) && (_WIN32_WINNT < 0x0501) +#if defined(__MINGW32__) && ( (!defined(_WIN32_WINNT)) || (_WIN32_WINNT < 0x0501) ) #undef _WIN32_WINNT #define _WIN32_WINNT 0x0501 #endif