From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 8 Oct 2003 19:56:44 +0000 (+0000)
Subject: bail out hard if ipv6 and ares are both enabled at the same time
X-Git-Tag: curl-7_10_8~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=867c189ef7a2079a21f9ab74cf7d79e1245d7f71;p=thirdparty%2Fcurl.git

bail out hard if ipv6 and ares are both enabled at the same time
---

diff --git a/lib/setup.h b/lib/setup.h
index bc5314baed..92decad04a 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -179,12 +179,16 @@ int fileno( FILE *stream);
 
 #endif
 
+#if defined(ENABLE_IPV6) && defined(USE_ARES)
+#error "ares does not yet support IPv6. Disable IPv6 or ares and rebuild"
+#endif
+
 /*
  * Curl_addrinfo MUST be used for name resolving information.
  * Information regarding a single IP witin a Curl_addrinfo MUST be stored in
  * a Curl_ipconnect struct.
  */
-#if defined(ENABLE_IPV6) && !defined(USE_ARES)
+#ifdef ENABLE_IPV6
 typedef struct addrinfo Curl_addrinfo;
 typedef struct addrinfo Curl_ipconnect;
 #else