From a40c6c45aa4018dc38a0b2ad2c050ddbedb237e5 Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Mon, 12 Sep 2022 14:48:25 +0000 Subject: On 1.7.x branch: Merge r1902578 from 1.8.x branch: win32: Fix build with IPv6 disabled. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1904012 13f79535-47bb-0310-9956-ffa450edef68 --- include/arch/win32/apr_arch_misc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/arch/win32/apr_arch_misc.h b/include/arch/win32/apr_arch_misc.h index 3b80502bd..4dbe899c4 100644 --- a/include/arch/win32/apr_arch_misc.h +++ b/include/arch/win32/apr_arch_misc.h @@ -490,6 +490,7 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, SetDllDirectoryW, 0, ( (lpPathName)); #define SetDllDirectoryW apr_winapi_SetDllDirectoryW +#if HAVE_IF_NAMETOINDEX #ifdef if_nametoindex #undef if_nametoindex #endif @@ -497,7 +498,9 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_IPHLPAPI, NET_IFINDEX, WINAPI, if_nametoindex, 0, IN PCSTR InterfaceName), (InterfaceName)); #define if_nametoindex apr_winapi_if_nametoindex +#endif +#if HAVE_IF_INDEXTONAME #ifdef if_indextoname #undef if_indextoname #endif @@ -506,6 +509,7 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_IPHLPAPI, PCHAR, NETIOAPI_API_, if_indextoname, 0, PCHAR InterfaceName), (InterfaceIndex, InterfaceName)); #define if_indextoname apr_winapi_if_indextoname +#endif #endif /* !defined(_WIN32_WCE) */ -- cgit v1.2.1