You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2022/07/08 17:33:41 UTC
svn commit: r1902578 - in /apr/apr/branches/1.8.x: ./ include/arch/win32/apr_arch_misc.h
Author: ivan
Date: Fri Jul 8 17:33:41 2022
New Revision: 1902578
URL: http://svn.apache.org/viewvc?rev=1902578&view=rev
Log:
Merge r1902577 from trunk:
win32: Fix build with IPv6 disabled.
Modified:
apr/apr/branches/1.8.x/ (props changed)
apr/apr/branches/1.8.x/include/arch/win32/apr_arch_misc.h
Propchange: apr/apr/branches/1.8.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1902577
Modified: apr/apr/branches/1.8.x/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.8.x/include/arch/win32/apr_arch_misc.h?rev=1902578&r1=1902577&r2=1902578&view=diff
==============================================================================
--- apr/apr/branches/1.8.x/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/branches/1.8.x/include/arch/win32/apr_arch_misc.h Fri Jul 8 17:33:41 2022
@@ -490,6 +490,7 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI
(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,
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 InterfaceName),
(InterfaceIndex, InterfaceName));
#define if_indextoname apr_winapi_if_indextoname
+#endif
#endif /* !defined(_WIN32_WCE) */