diff options
| -rw-r--r-- | include/arch/win32/apr_arch_misc.h | 2 | ||||
| -rw-r--r-- | network_io/unix/sockaddr.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/arch/win32/apr_arch_misc.h b/include/arch/win32/apr_arch_misc.h index bf647e729..5e87b6bb4 100644 --- a/include/arch/win32/apr_arch_misc.h +++ b/include/arch/win32/apr_arch_misc.h @@ -398,7 +398,7 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_IPHLPAPI, NET_IFINDEX, WINAPI, if_nametoindex, 0, #undef if_indextoname #endif APR_DECLARE_LATE_DLL_FUNC(DLL_IPHLPAPI, PCHAR, NETIOAPI_API_, if_indextoname, 0, ( - NET_IFINDEX InterfaceIndex + NET_IFINDEX InterfaceIndex, PCHAR InterfaceName), (InterfaceIndex, InterfaceName)); #define if_indextoname apr_winapi_if_indextoname diff --git a/network_io/unix/sockaddr.c b/network_io/unix/sockaddr.c index f3f0f5928..16f3abfd4 100644 --- a/network_io/unix/sockaddr.c +++ b/network_io/unix/sockaddr.c @@ -30,7 +30,7 @@ #endif #if defined(HAVE_IF_INDEXTONAME) && defined(_MSC_VER) -#include <Iphlpapi.h> +#include "arch/win32/apr_arch_misc.h" #endif #define APR_WANT_STRFUNC @@ -1251,7 +1251,7 @@ APR_DECLARE(apr_status_t) apr_sockaddr_zone_set(apr_sockaddr_t *sa, return APR_EGENERAL; } - sa->sa.sin6.sin6_scope_id = i; + sa->sa.sin6.sin6_scope_id = (unsigned int) i; return APR_SUCCESS; } #endif |