Commit bcc29cda authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed compilation when the synchronous resolver is used

parent 42354571

lib/asyn.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ Curl_addrinfo *Curl_resolver_getaddrinfo(struct connectdata *conn, 
#ifndef CURLRES_ASYNCH

/* convert these functions if an asynch resolver isn't used */

#define Curl_resolver_cancel(x)

#define Curl_async_resolved(x,y) CURLE_OK

#define Curl_resolver_is_resolved(x,y) CURLE_COULDNT_RESOLVE_HOST

#define Curl_resolver_wait_resolv(x,y) CURLE_COULDNT_RESOLVE_HOST

#define Curl_resolver_getsock(x,y,z) 0

lib/hostip.h

+8 −1
Original line number Diff line number Diff line
@@ -146,11 +146,18 @@ int curl_dogetnameinfo(GETNAMEINFO_QUAL_ARG1 GETNAMEINFO_TYPE_ARG1 sa, 
/* IPv4 threadsafe resolve function used for synch and asynch builds */

Curl_addrinfo *Curl_ipv4_resolve_r(const char * hostname, int port);



CURLcode Curl_async_resolved(struct connectdata *conn,

                             bool *protocol_connect);



#ifndef CURLRES_ASYNCH

#define Curl_async_resolved(x,y) CURLE_OK

#endif



/*

 * Curl_addrinfo_callback() is used when we build with any asynch specialty.

 * Handles end of async request processing. Inserts ai into hostcache when

 * status is CURL_ASYNC_SUCCESS. Twiddles fields in conn to indicate async

 * request completed wether successful or failed.

 * request completed whether successful or failed.

 */

CURLcode Curl_addrinfo_callback(struct connectdata *conn,

                                int status,

lib/url.h

+0 −2
Original line number Diff line number Diff line
@@ -37,8 +37,6 @@ void Curl_freeset(struct SessionHandle * data); 
CURLcode Curl_close(struct SessionHandle *data); /* opposite of curl_open() */

CURLcode Curl_connect(struct SessionHandle *, struct connectdata **,

                      bool *async, bool *protocol_connect);

CURLcode Curl_async_resolved(struct connectdata *conn,

                             bool *protocol_connect);

CURLcode Curl_do(struct connectdata **, bool *done);

CURLcode Curl_do_more(struct connectdata *);

CURLcode Curl_done(struct connectdata **, CURLcode, bool premature);