[prev in list] [next in list] [prev in thread] [next in thread]
List: apr-cvs
Subject: svn commit: r1904012 - in /apr/apr/branches/1.7.x: ./ include/arch/win32/apr_arch_misc.h
From: ivan () apache ! org
Date: 2022-09-12 14:48:26
Message-ID: 20220912144826.11A4C17AB2F () svn01-us-east ! apache ! org
[Download RAW message or body]
Author: ivan
Date: Mon Sep 12 14:48:25 2022
New Revision: 1904012
URL: http://svn.apache.org/viewvc?rev=1904012&view=rev
Log:
On 1.7.x branch: Merge r1902578 from 1.8.x branch:
win32: Fix build with IPv6 disabled.
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/include/arch/win32/apr_arch_misc.h
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/branches/1.8.x:r1902578
Merged /apr/apr/trunk:r1902577
Modified: apr/apr/branches/1.7.x/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/include/arch/win32/apr_arch_misc.h?rev=1904012&r1=1904011&r2=1904012&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/branches/1.7.x/include/arch/win32/apr_arch_misc.h Mon Sep 12 14:48:25 \
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) */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic