moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-11 07:39:50 -04:00
Code Issues Releases Wiki Activity

adjust preprocessor symbol definition check relative to resolver specialty

Browse Source
This commit is contained in:
Yang Tse 2010-01-23 13:53:33 +00:00
parent 703fa98a48
commit 597ad5a2ce
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/hostip.c
View File

@ -76,8 +76,8 @@
/* The last #include file should be: */ /* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
#if defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) \ #if defined(CURLRES_SYNCH) && \
&& !defined(USE_ARES) defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP)
/* alarm-based timeouts can only be used with all the dependencies satisfied */ /* alarm-based timeouts can only be used with all the dependencies satisfied */
#define USE_ALARM_TIMEOUT #define USE_ALARM_TIMEOUT
#endif #endif

5
lib/url.c
View File

@ -2489,11 +2489,12 @@ static void conn_free(struct connectdata *conn)
Curl_llist_destroy(conn->done_pipe, NULL); Curl_llist_destroy(conn->done_pipe, NULL);
/* possible left-overs from the async name resolvers */ /* 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.hostname);
Curl_safefree(conn->async.os_specific); Curl_safefree(conn->async.os_specific);
#elif defined(CURLRES_THREADED) #if defined(CURLRES_THREADED)
Curl_destroy_thread_data(&conn->async); Curl_destroy_thread_data(&conn->async);
#endif
#endif #endif
Curl_free_ssl_config(&conn->ssl_config); Curl_free_ssl_config(&conn->ssl_config);

2
lib/version.c
View File

@ -217,7 +217,7 @@ static curl_version_info_data version_info = {
#ifdef CURLDEBUG #ifdef CURLDEBUG
| CURL_VERSION_CURLDEBUG | CURL_VERSION_CURLDEBUG
#endif #endif
#ifdef USE_ARES #ifdef CURLRES_ASYNCH
| CURL_VERSION_ASYNCHDNS | CURL_VERSION_ASYNCHDNS
#endif #endif
#ifdef HAVE_SPNEGO #ifdef HAVE_SPNEGO