From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 26 May 2014 20:10:15 +0000 (+0200)
Subject: url-parser: only use if_nametoindex if detected by configure
X-Git-Tag: curl-7_37_1~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b89456509c1ae3907bd65d9bc2114423ee4e790;p=thirdparty%2Fcurl.git

url-parser: only use if_nametoindex if detected by configure

The previous #ifdef detection wasn't good enough.

Bug: http://curl.haxx.se/mail/lib-2014-05/0260.html
Reported-by: Chris Young
---

diff --git a/configure.ac b/configure.ac
index 11772444ee..d9b7a247e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3035,6 +3035,7 @@ AC_CHECK_FUNCS([fork \
   getpwuid \
   getrlimit \
   gettimeofday \
+  if_nametoindex \
   inet_addr \
   perror \
   pipe \
diff --git a/lib/url.c b/lib/url.c
index 29222926e4..fba3bd3917 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -4009,7 +4009,7 @@ static CURLcode parseurlandfillconn(struct SessionHandle *data,
       }
       else {
         /* Zone identifier is not numeric */
-#if defined(HAVE_NET_IF_H) && defined(IFNAMSIZ)
+#if defined(HAVE_NET_IF_H) && defined(IFNAMSIZ) && defined(HAVE_IF_NAMETOINDEX)
         char ifname[IFNAMSIZ + 2];
         char *square_bracket;
         unsigned int scopeidx = 0;