annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3773
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
1 This file is part of MXE.
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
2 See index.html for further information.
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
3
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
4 Some functions in netioapi.h were only added in Windows Vista. This patch removes
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
5 function definitions for if_nametoindex and if_indextoname on older API
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
6 versions, so they don't conflict with replacement implementations in libraries
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
7 (e.g. glib).
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
8
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
9 This is fixed on the 4.x branch of mingw-w64.
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
10
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
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
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
12 --- mingw-w64-v3.3.0.orig/mingw-w64-headers/include/netioapi.h 2015-01-17 00:07:51.030935703 +0100
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
13 +++ mingw-w64-v3.3.0/mingw-w64-headers/include/netioapi.h 2015-01-17 01:09:47.546591536 +0100
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
14 @@ -311,6 +311,7 @@
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
15 PNET_LUID InterfaceLuid
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
16 );
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
17
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
18 +#if (_WIN32_WINNT >= 0x0600)
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
19 PCHAR WINAPI if_indextoname(
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
20 NET_IFINDEX InterfaceIndex,
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
21 PCHAR InterfaceName
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
22 @@ -319,6 +320,7 @@
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
23 NET_IFINDEX WINAPI if_nametoindex(
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
24 PCSTR InterfaceName
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
25 );
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
26 +#endif
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
27
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
28 NETIO_STATUS WINAPI ConvertInterfaceGuidToLuid(
42666a54673f mingw-w64: added mingw-w64-2-netioapi-winxp.patch from mxe
John Donoghue
parents:
diff changeset
29 const GUID *InterfaceGuid,