diff options
| author | Zenju <zenju@gmx.de> | 2019-05-22 11:11:36 +0200 |
|---|---|---|
| committer | Marcel Raad <Marcel.Raad@teamviewer.com> | 2019-05-23 11:10:28 +0200 |
| commit | 170bd047f5f73ffa914ff21205018966f31e09c0 (patch) | |
| tree | 0ea864b43a1710be61cad97d8ea844b4b5cec45b | |
| parent | c2a8d52a1356a722ff9f4aeb983cd4eaf80ef221 (diff) | |
| download | curl-170bd047f5f73ffa914ff21205018966f31e09c0.tar.gz | |
config-win32: add support for if_nametoindex and getsockname
Closes https://github.com/curl/curl/pull/3923
| -rw-r--r-- | lib/config-win32.h | 18 | ||||
| -rw-r--r-- | lib/url.c | 4 |
2 files changed, 19 insertions, 3 deletions
diff --git a/lib/config-win32.h b/lib/config-win32.h index 24c35d339..08cfd0d4c 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -154,6 +154,11 @@ #define HAVE_WS2TCPIP_H 1 #endif +/* Define if you have the <Iphlpapi.h> header file. */ +#ifndef __SALFORDC__ +#define HAVE_IPHLPAPI_H 1 +#endif + /* ---------------------------------------------------------------- */ /* OTHER HEADER INFO */ /* ---------------------------------------------------------------- */ @@ -188,6 +193,9 @@ /* Define to 1 if you have the `getpeername' function. */ #define HAVE_GETPEERNAME 1 +/* Define to 1 if you have the getsockname function. */ +#define HAVE_GETSOCKNAME 1 + /* Define if you have the gethostbyaddr function. */ #define HAVE_GETHOSTBYADDR 1 @@ -582,8 +590,9 @@ Vista # endif #endif -/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is - quite convoluted, compiler dependent and even build target dependent. */ +/* Availability of freeaddrinfo, getaddrinfo, getnameinfo and if_nametoindex + functions is quite convoluted, compiler dependent and even build target + dependent. */ #if defined(HAVE_WS2TCPIP_H) # if defined(__POCC__) # define HAVE_FREEADDRINFO 1 @@ -602,6 +611,11 @@ Vista # define HAVE_GETNAMEINFO 1 # endif #endif +#if defined(HAVE_IPHLPAPI_H) + #if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) + #define HAVE_IF_NAMETOINDEX 1 + #endif +#endif #if defined(__POCC__) # ifndef _MSC_VER @@ -34,10 +34,12 @@ #ifdef HAVE_NET_IF_H #include <net/if.h> #endif +#ifdef HAVE_IPHLPAPI_H +#include <Iphlpapi.h> +#endif #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif - #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif |