aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2011-04-25 19:01:40 -0700
committerDan Fandrich <dan@coneharvesters.com>2011-04-25 19:01:40 -0700
commitbcc29cda8e1e57a29cffb18768d7ed3810b61907 (patch)
treee34904695b2ce454a71d75c7b915e30baba28fd5
parent4235457129d6993ab0620ae07f16031f9637fd01 (diff)
Fixed compilation when the synchronous resolver is used
-rw-r--r--lib/asyn.h1
-rw-r--r--lib/hostip.h9
-rw-r--r--lib/url.h2
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/asyn.h b/lib/asyn.h
index 801ae79c4..4e16de03d 100644
--- a/lib/asyn.h
+++ b/lib/asyn.h
@@ -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
diff --git a/lib/hostip.h b/lib/hostip.h
index 15a84c467..32a37b9dd 100644
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -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,
diff --git a/lib/url.h b/lib/url.h
index d6bb068c7..bf5d2042f 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -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);