From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 26 Nov 2020 16:26:59 +0000 (+0100)
Subject: curl_setup: USE_RESOLVE_ON_IPS is for Apple native resolver use
X-Git-Tag: curl-7_74_0~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6ced230fe180588aee19ef2daf1ee55bc8de6d3;p=thirdparty%2Fcurl.git

curl_setup: USE_RESOLVE_ON_IPS is for Apple native resolver use

... so don't define it when instructed to use c-ares!
---

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 59fb3fd53f..22def2defa 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -238,7 +238,7 @@
  * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64,
  * performing this task will result in a synthesized IPv6 address.
  */
-#ifdef  __APPLE__
+#if defined(__APPLE__) && !defined(USE_ARES)
 #define USE_RESOLVE_ON_IPS 1
 #endif