romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-05 13:36:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Follow-up to 2481dbe5f4 and applies the change the way it was
intended.
This commit is contained in:
Daniel Stenberg 2022-09-27 09:32:20 +02:00
parent 92b9624a68
commit 99d3682303
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/curl_setup.h
View file

@ -519,9 +519,6 @@
# ifdef byte
# undef byte
# endif
# ifdef resolve_ip
# undef resolve_ip
# endif
# endif /* MSDOS */

8
lib/url.c
View file

@ -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);
}
/*************************************************************