From bf24e0f9286cf5f24ccfef7f824d1597ffb6ab72 Mon Sep 17 00:00:00 2001
From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Thu, 5 Dec 2019 14:13:46 +0100
Subject: 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
---
 lib/curl_setup.h | 12 ++++++------
 1 file 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
-
 /* ---------------------------------------------------------------- */
 
 /*
-- 
cgit v1.2.1