summaryrefslogtreecommitdiff
path: root/lib/curl_setup.h
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2019-12-05 14:13:46 +0100
committerMarcel Raad <Marcel.Raad@teamviewer.com>2019-12-05 20:17:47 +0100
commitbf24e0f9286cf5f24ccfef7f824d1597ffb6ab72 (patch)
tree93f4b0becab2861e8cf1fc35657e807797d10d88 /lib/curl_setup.h
parent914975fe6e4f8606899292bb7f19527efd8c863b (diff)
downloadcurl-bf24e0f9286cf5f24ccfef7f824d1597ffb6ab72.tar.gz
curl_setup: fix `CURLRES_IPV6` condition
Move the definition of `CURLRES_IPV6` to before undefining `HAVE_GETADDRINFO`. Regression from commit 67a08dca27a which caused some tests to fail and others to be skipped with c-ares. Fixes https://github.com/curl/curl/issues/4673 Closes https://github.com/curl/curl/pull/4677
Diffstat (limited to 'lib/curl_setup.h')
-rw-r--r--lib/curl_setup.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 5d6e8d6f7..4ecda6a9b 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -571,6 +571,12 @@
* Mutually exclusive CURLRES_* definitions.
*/
+#if defined(ENABLE_IPV6) && defined(HAVE_GETADDRINFO)
+# define CURLRES_IPV6
+#else
+# define CURLRES_IPV4
+#endif
+
#ifdef USE_ARES
# define CURLRES_ASYNCH
# define CURLRES_ARES
@@ -585,12 +591,6 @@
# define CURLRES_SYNCH
#endif
-#if defined(ENABLE_IPV6) && defined(HAVE_GETADDRINFO)
-# define CURLRES_IPV6
-#else
-# define CURLRES_IPV4
-#endif
-
/* ---------------------------------------------------------------- */
/*