aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2014-05-26 22:10:15 +0200
committerDaniel Stenberg <daniel@haxx.se>2014-05-26 22:10:15 +0200
commit1b89456509c1ae3907bd65d9bc2114423ee4e790 (patch)
tree427aa34149c102f09a6131bda0ce701338dedf4b
parent9d85d4746bcac97a06006db462f02037ffaabae0 (diff)
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
-rw-r--r--configure.ac1
-rw-r--r--lib/url.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 11772444e..d9b7a247e 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 29222926e..fba3bd391 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;