Mercurial > mxe-octave

view src/mingw-w64-2-netioapi-winxp.patch @ 3926:ee802fc5dd9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc: update to 5.1.0, update isl, libgpg_error * src/build-gcc.mk: update version, checksum, remove cloog as a dependancy * src/gcc-isl-1-fixes.patch: remove patch * src/isl-1-fixes.patch: update patch * src/isl.mk: update version, checksum * src/libgpg_error-1-fixes.patch: remove patch * src/libgpg_error.mk: update version, checksum * src/native-gcc.mk: update version, checksum, remove cloog as a dependancy * dist-files.mk: remove gcc-isl-1-fixes.patch, libgpg_error-1-fixes.patch
author John D
date Sun, 03 May 2015 20:38:29 -0400
parents 42666a54673f
children
line wrap: on
line source

This file is part of MXE.
See index.html for further information.

Some functions in netioapi.h were only added in Windows Vista. This patch removes
function definitions for if_nametoindex and if_indextoname on older API
versions, so they don't conflict with replacement implementations in libraries
(e.g. glib).

This is fixed on the 4.x branch of mingw-w64.

diff -Naur mingw-w64-v3.3.0.orig/mingw-w64-headers/include/netioapi.h mingw-w64-v3.3.0/mingw-w64-headers/include/netioapi.h
--- mingw-w64-v3.3.0.orig/mingw-w64-headers/include/netioapi.h	2015-01-17 00:07:51.030935703 +0100
+++ mingw-w64-v3.3.0/mingw-w64-headers/include/netioapi.h	2015-01-17 01:09:47.546591536 +0100
@@ -311,6 +311,7 @@
   PNET_LUID InterfaceLuid
 );
 
+#if (_WIN32_WINNT >= 0x0600)
 PCHAR WINAPI if_indextoname(
   NET_IFINDEX InterfaceIndex,
   PCHAR InterfaceName
@@ -319,6 +320,7 @@
 NET_IFINDEX WINAPI if_nametoindex(
   PCSTR InterfaceName
 );
+#endif
 
 NETIO_STATUS WINAPI ConvertInterfaceGuidToLuid(
   const GUID *InterfaceGuid,