aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2005-12-19 05:57:17 +0000
committerYang Tse <yangsita@gmail.com>2005-12-19 05:57:17 +0000
commitd6eb1a7b9800139669cc05e6dbdffa996d038df6 (patch)
treebcd4888221ba1f4a94c32f828cccd10b1238a5df
parent4ff56b15e9b6e51c914c8d5e4ea23eb247f9ffc6 (diff)
Fix guard detection of _WIN32_WINNT for MingW in CURL_FUNC_GETNAMEINFO_ARGTYPES
-rw-r--r--acinclude.m42
-rw-r--r--ares/acinclude.m42
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