From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 27 Sep 2022 07:32:20 +0000 (+0200)
Subject: url: rename function due to name-clash in Watt-32
X-Git-Tag: curl-7_86_0~159
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99d3682303b35d05e7916c117b873c59b9bc1d9f;p=thirdparty%2Fcurl.git

url: rename function due to name-clash in Watt-32

Follow-up to 2481dbe5f4f58 and applies the change the way it was
intended.
---

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index eb36259085..03a6afc4f6 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -519,9 +519,6 @@
 #    ifdef byte
 #      undef byte
 #    endif
-#    ifdef resolve_ip
-#      undef resolve_ip
-#    endif
 
 #  endif /* MSDOS */
 
diff --git a/lib/url.c b/lib/url.c
index 33aa19be95..65eefb86e2 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -3503,9 +3503,9 @@ static CURLcode resolve_proxy(struct Curl_easy *data,
 }
 #endif
 
-static CURLcode resolve_ip(struct Curl_easy *data,
-                           struct connectdata *conn,
-                           bool *async)
+static CURLcode resolve_host(struct Curl_easy *data,
+                             struct connectdata *conn,
+                             bool *async)
 {
   struct Curl_dns_entry *hostaddr = NULL;
   struct hostname *connhost;
@@ -3571,7 +3571,7 @@ static CURLcode resolve_fresh(struct Curl_easy *data,
     return resolve_proxy(data, conn, async);
 #endif
 
-  return resolve_ip(data, conn, async);
+  return resolve_host(data, conn, async);
 }
 
 /*************************************************************