moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-15 05:55:04 -05:00
Code Issues Releases Wiki Activity

config-win32: add support for if_nametoindex and getsockname

Browse Source 
Closes https://github.com/curl/curl/pull/3923
This commit is contained in:
Zenju 2019-05-22 11:11:36 +02:00 committed by Marcel Raad
parent c2a8d52a13
commit 170bd047f5
No known key found for this signature in database
GPG Key ID: 33C416EFAE4D6F02
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/config-win32.h
View File

@ -154,6 +154,11 @@
#define HAVE_WS2TCPIP_H 1 #define HAVE_WS2TCPIP_H 1
#endif #endif
/* Define if you have the <Iphlpapi.h> header file. */
#ifndef __SALFORDC__
#define HAVE_IPHLPAPI_H 1
#endif
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* OTHER HEADER INFO */ /* OTHER HEADER INFO */
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
@ -188,6 +193,9 @@
/* Define to 1 if you have the `getpeername' function. */ /* Define to 1 if you have the `getpeername' function. */
#define HAVE_GETPEERNAME 1 #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 if you have the gethostbyaddr function. */
#define HAVE_GETHOSTBYADDR 1 #define HAVE_GETHOSTBYADDR 1
@ -582,8 +590,9 @@ Vista
# endif # endif
#endif #endif
/* Availability of freeaddrinfo, getaddrinfo and getnameinfo functions is /* Availability of freeaddrinfo, getaddrinfo, getnameinfo and if_nametoindex
quite convoluted, compiler dependent and even build target dependent. */ functions is quite convoluted, compiler dependent and even build target
dependent. */
#if defined(HAVE_WS2TCPIP_H) #if defined(HAVE_WS2TCPIP_H)
# if defined(__POCC__) # if defined(__POCC__)
# define HAVE_FREEADDRINFO 1 # define HAVE_FREEADDRINFO 1
@ -602,6 +611,11 @@ Vista
# define HAVE_GETNAMEINFO 1 # define HAVE_GETNAMEINFO 1
# endif # endif
#endif #endif
#if defined(HAVE_IPHLPAPI_H)
#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600)
#define HAVE_IF_NAMETOINDEX 1
#endif
#endif
#if defined(__POCC__) #if defined(__POCC__)
# ifndef _MSC_VER # ifndef _MSC_VER

4
lib/url.c
View File

@ -34,10 +34,12 @@
#ifdef HAVE_NET_IF_H #ifdef HAVE_NET_IF_H
#include <net/if.h> #include <net/if.h>
#endif #endif
#ifdef HAVE_IPHLPAPI_H
#include <Iphlpapi.h>
#endif
#ifdef HAVE_SYS_IOCTL_H #ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>
#endif #endif