From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 31 Mar 2004 21:33:52 +0000 (+0000)
Subject: Use the new HAVE_NI_WITHSCOPEID define instead of merely checking for the
X-Git-Tag: curl-7_11_2~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5804c995e1f72ec7013ddb69b9f5a42d8db25141;p=thirdparty%2Fcurl.git

Use the new HAVE_NI_WITHSCOPEID define instead of merely checking for the
existance of NI_WITHSCOPEID since some platforms have that define but still
can't function with it set.
---

diff --git a/lib/ftp.c b/lib/ftp.c
index a8923c0cf0..6df8f22c6c 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -105,7 +105,7 @@
 #include "memdebug.h"
 #endif
 
-#ifdef NI_WITHSCOPEID
+#ifdef HAVE_NI_WITHSCOPEID
 #define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID
 #else
 #define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV
diff --git a/lib/url.c b/lib/url.c
index ef2732b067..805acd0e68 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1877,7 +1877,7 @@ static void verboseconnect(struct connectdata *conn,
 #ifdef ENABLE_IPV6
   {
     char hbuf[NI_MAXHOST];
-#ifdef NI_WITHSCOPEID
+#ifdef HAVE_NI_WITHSCOPEID
 #define NIFLAGS NI_NUMERICHOST | NI_WITHSCOPEID
 #else
 #define NIFLAGS NI_NUMERICHOST