You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2019/03/19 20:17:23 UTC

svn commit: r1855864 - in /apr/apr/trunk: include/arch/win32/apr_arch_misc.h network_io/unix/sockaddr.c

Author: wrowe
Date: Tue Mar 19 20:17:23 2019
New Revision: 1855864

URL: http://svn.apache.org/viewvc?rev=1855864&view=rev
Log:
Small corrections to if_indextoname resolution on win32, compiles clean

Modified:
    apr/apr/trunk/include/arch/win32/apr_arch_misc.h
    apr/apr/trunk/network_io/unix/sockaddr.c

Modified: apr/apr/trunk/include/arch/win32/apr_arch_misc.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/win32/apr_arch_misc.h?rev=1855864&r1=1855863&r2=1855864&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/win32/apr_arch_misc.h (original)
+++ apr/apr/trunk/include/arch/win32/apr_arch_misc.h Tue Mar 19 20:17:23 2019
@@ -398,7 +398,7 @@ APR_DECLARE_LATE_DLL_FUNC(DLL_IPHLPAPI,
 #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

Modified: apr/apr/trunk/network_io/unix/sockaddr.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/network_io/unix/sockaddr.c?rev=1855864&r1=1855863&r2=1855864&view=diff
==============================================================================
--- apr/apr/trunk/network_io/unix/sockaddr.c (original)
+++ apr/apr/trunk/network_io/unix/sockaddr.c Tue Mar 19 20:17:23 2019
@@ -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_z
             return APR_EGENERAL;
         }
 
-        sa->sa.sin6.sin6_scope_id = i;
+        sa->sa.sin6.sin6_scope_id = (unsigned int) i;
         return APR_SUCCESS;
     }
 #endif