diff options
| author | Ivan Zhakov <ivan@apache.org> | 2022-07-08 17:33:41 +0000 |
|---|---|---|
| committer | Ivan Zhakov <ivan@apache.org> | 2022-07-08 17:33:41 +0000 |
| commit | 317ebede4c0fa14b0c71525064d649f0b7bcd568 (patch) | |
| tree | 4958c3e99c1bfa0ef244a7666804ed9d50fb1ef1 | |
| parent | cda3d9dd6f092b63595fd2e0f8a3008316ae1972 (diff) | |
| download | apr-317ebede4c0fa14b0c71525064d649f0b7bcd568.tar.gz | |
Merge r1902577 from trunk:
win32: Fix build with IPv6 disabled.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.8.x@1902578 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | include/arch/win32/apr_arch_misc.h | 4 |
1 files changed, 4 insertions, 0 deletions
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) */ |