From: Gisle Vanem <gvanem@yahoo.no>
Date: Sat, 24 Sep 2022 18:58:09 +0000 (+0200)
Subject: url: rename function due to name-clash in Watt-32
X-Git-Tag: curl-7_86_0~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2481dbe5f4f581a3556b56cdc5a6d46be35e827d;p=thirdparty%2Fcurl.git

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

Since the commit 764c958c52edb427f39, there was a new function called
resolve_ip(). This clashes with an internal function in Watt-32.

Closes #9585
---

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 03a6afc4f6..eb36259085 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -519,6 +519,9 @@
 #    ifdef byte
 #      undef byte
 #    endif
+#    ifdef resolve_ip
+#      undef resolve_ip
+#    endif
 
 #  endif /* MSDOS */