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 a8923c0cf094714a1a227188f21b9b495b38d5a7..6df8f22c6c11d5f6b86e12d6b02c35753af355f3 100644 (file)
--- 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 ef2732b0670b161d071572a4a344fdfbbb59a475..805acd0e68d76f9e98ce8442690badccc3946c6a 100644 (file)
--- 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