diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-26 13:30:18 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-26 13:30:25 (GMT) |
| commit | ac4ac035976ed4f253854966303c5c34886860e9 (patch) | |
| tree | 043554f2c09f5519128579f3de7bd5b5e9ac568e /Utilities/cmcurl/lib/hostip4.c | |
| parent | 035a3940f5c5ac4206b9b841be5d974e0b038c2f (diff) | |
| parent | e5ff413f41877dc46498c384fa4f6e5b23ec1476 (diff) | |
| download | CMake-ac4ac035976ed4f253854966303c5c34886860e9.zip CMake-ac4ac035976ed4f253854966303c5c34886860e9.tar.gz CMake-ac4ac035976ed4f253854966303c5c34886860e9.tar.bz2 | |
Merge topic 'update-curl'
e5ff413f41 curl: Set build options the way we need for CMake
0ef8fa5000 Merge branch 'upstream-curl' into update-curl
5717fdc114 curl 2020-06-23 (e9db32a0)
39f7cfad31 curl: Update script to get curl 7.71.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4937
Diffstat (limited to 'Utilities/cmcurl/lib/hostip4.c')
| -rw-r--r-- | Utilities/cmcurl/lib/hostip4.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Utilities/cmcurl/lib/hostip4.c b/Utilities/cmcurl/lib/hostip4.c index d5009a3..eae9416 100644 --- a/Utilities/cmcurl/lib/hostip4.c +++ b/Utilities/cmcurl/lib/hostip4.c @@ -88,12 +88,12 @@ bool Curl_ipvalid(struct connectdata *conn) * flavours have thread-safe versions of the plain gethostbyname() etc. * */ -Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, - const char *hostname, - int port, - int *waitp) +struct Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, + const char *hostname, + int port, + int *waitp) { - Curl_addrinfo *ai = NULL; + struct Curl_addrinfo *ai = NULL; #ifdef CURL_DISABLE_VERBOSE_STRINGS (void)conn; @@ -119,13 +119,13 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, * implying that only threadsafe code and function calls may be used. * */ -Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, - int port) +struct Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, + int port) { #if !defined(HAVE_GETADDRINFO_THREADSAFE) && defined(HAVE_GETHOSTBYNAME_R_3) int res; #endif - Curl_addrinfo *ai = NULL; + struct Curl_addrinfo *ai = NULL; struct hostent *h = NULL; struct hostent *buf = NULL; |