Mercurial > mxe-octave
comparison src/mingw-w64-2-netioapi-winxp.patch @ 3773:42666a54673f
mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
* mingw-w64-2-netioapi-winxp.patch: new file
* dist-files.mk: added mingw-w64-2-netioapi-winxp.patch
| author | John Donoghue |
|---|---|
| date | Wed, 21 Jan 2015 08:21:40 -0500 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| 3772:078b47125239 | 3773:42666a54673f |
|---|---|
| 1 This file is part of MXE. | |
| 2 See index.html for further information. | |
| 3 | |
| 4 Some functions in netioapi.h were only added in Windows Vista. This patch removes | |
| 5 function definitions for if_nametoindex and if_indextoname on older API | |
| 6 versions, so they don't conflict with replacement implementations in libraries | |
| 7 (e.g. glib). | |
| 8 | |
| 9 This is fixed on the 4.x branch of mingw-w64. | |
| 10 | |
| 11 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 | |
| 12 --- mingw-w64-v3.3.0.orig/mingw-w64-headers/include/netioapi.h 2015-01-17 00:07:51.030935703 +0100 | |
| 13 +++ mingw-w64-v3.3.0/mingw-w64-headers/include/netioapi.h 2015-01-17 01:09:47.546591536 +0100 | |
| 14 @@ -311,6 +311,7 @@ | |
| 15 PNET_LUID InterfaceLuid | |
| 16 ); | |
| 17 | |
| 18 +#if (_WIN32_WINNT >= 0x0600) | |
| 19 PCHAR WINAPI if_indextoname( | |
| 20 NET_IFINDEX InterfaceIndex, | |
| 21 PCHAR InterfaceName | |
| 22 @@ -319,6 +320,7 @@ | |
| 23 NET_IFINDEX WINAPI if_nametoindex( | |
| 24 PCSTR InterfaceName | |
| 25 ); | |
| 26 +#endif | |
| 27 | |
| 28 NETIO_STATUS WINAPI ConvertInterfaceGuidToLuid( | |
| 29 const GUID *InterfaceGuid, |