diff options
| author | Yang Tse <yangsita@gmail.com> | 2010-01-23 13:53:33 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2010-01-23 13:53:33 +0000 |
| commit | 597ad5a2ce99b8e74c32f7ead13581d2e9b23155 (patch) | |
| tree | cc76ff812255c55f4d5263386be055f157ebe1a3 /lib | |
| parent | 703fa98a487948dd8746c4a82b7d657042426134 (diff) | |
adjust preprocessor symbol definition check relative to resolver specialty
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/hostip.c | 4 | ||||
| -rw-r--r-- | lib/url.c | 5 | ||||
| -rw-r--r-- | lib/version.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/hostip.c b/lib/hostip.c index 0ef806b72..4acf1217e 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -76,8 +76,8 @@ /* The last #include file should be: */ #include "memdebug.h" -#if defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) \ - && !defined(USE_ARES) +#if defined(CURLRES_SYNCH) && \ + defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) /* alarm-based timeouts can only be used with all the dependencies satisfied */ #define USE_ALARM_TIMEOUT #endif @@ -2489,12 +2489,13 @@ static void conn_free(struct connectdata *conn) Curl_llist_destroy(conn->done_pipe, NULL); /* possible left-overs from the async name resolvers */ -#if defined(USE_ARES) +#if defined(CURLRES_ASYNCH) Curl_safefree(conn->async.hostname); Curl_safefree(conn->async.os_specific); -#elif defined(CURLRES_THREADED) +#if defined(CURLRES_THREADED) Curl_destroy_thread_data(&conn->async); #endif +#endif Curl_free_ssl_config(&conn->ssl_config); diff --git a/lib/version.c b/lib/version.c index 03131e988..ec57885e9 100644 --- a/lib/version.c +++ b/lib/version.c @@ -217,7 +217,7 @@ static curl_version_info_data version_info = { #ifdef CURLDEBUG | CURL_VERSION_CURLDEBUG #endif -#ifdef USE_ARES +#ifdef CURLRES_ASYNCH | CURL_VERSION_ASYNCHDNS #endif #ifdef HAVE_SPNEGO |