summaryrefslogtreecommitdiff
path: root/lib/hostip6.c
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@broadpark.no>2006-07-21 04:22:44 +0000
committerGisle Vanem <gvanem@broadpark.no>2006-07-21 04:22:44 +0000
commit02938a010db060a3d14ae0df6a3f95941c33b810 (patch)
tree7c201a10bd21bcfd7321b8684f9815f794da60ac /lib/hostip6.c
parente40641bf7c15f8f4b850d52153b4cca9fd56810f (diff)
downloadcurl-02938a010db060a3d14ae0df6a3f95941c33b810.tar.gz
Changes for combination ENABLE_IPV6 and USE_ARES.
Diffstat (limited to 'lib/hostip6.c')
-rw-r--r--lib/hostip6.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/hostip6.c b/lib/hostip6.c
index 55be255e7..b013ee902 100644
--- a/lib/hostip6.c
+++ b/lib/hostip6.c
@@ -191,7 +191,7 @@ bool Curl_ipvalid(struct SessionHandle *data)
return TRUE;
}
-#ifndef USE_THREADING_GETADDRINFO
+#if !defined(USE_THREADING_GETADDRINFO) && !defined(USE_ARES)
#ifdef DEBUG_ADDRINFO
static void dump_addrinfo(struct connectdata *conn, const struct addrinfo *ai)
@@ -213,7 +213,8 @@ static void dump_addrinfo(struct connectdata *conn, const struct addrinfo *ai)
#endif
/*
- * Curl_getaddrinfo() when built ipv6-enabled (non-threading version).
+ * Curl_getaddrinfo() when built ipv6-enabled (non-threading and
+ * non-ares version).
*
* Returns name information about the given hostname and port number. If
* successful, the 'addrinfo' is returned and the forth argument will point to
@@ -295,6 +296,6 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn,
return res;
}
-#endif /* USE_THREADING_GETADDRINFO */
+#endif /* !USE_THREADING_GETADDRINFO && !USE_ARES */
#endif /* ipv6 */