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 eb3625908527f8c96ac998b35dc69e843a624ad6..03a6afc4f6beee2b713f8332c893c34eaaafae1a 100644 (file)
--- 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 33aa19be95d0ebab013fe0dd3bbdfa00b8fcf8c4..65eefb86e2e5961f26675d82b0378c03cd22394a 100644 (file)
--- 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);
 }
 
 /*************************************************************