diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-03-14 10:27:22 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-03-14 13:16:00 (GMT) |
| commit | fc2f44482f524be8ad61239f8bbd13c38ba6d8b7 (patch) | |
| tree | 9b1d401177b11ad8e1a3f79823cf8105a8b5824b /src | |
| parent | 149afe17a43c50c234dcadeb4a69e61e272a747a (diff) | |
| download | mxe-fc2f44482f524be8ad61239f8bbd13c38ba6d8b7.zip mxe-fc2f44482f524be8ad61239f8bbd13c38ba6d8b7.tar.gz mxe-fc2f44482f524be8ad61239f8bbd13c38ba6d8b7.tar.bz2 | |
mingw-w64: update
Diffstat (limited to 'src')
| -rw-r--r-- | src/mingw-w64-2-netioapi-winxp.patch | 29 | ||||
| -rw-r--r-- | src/mingw-w64.mk | 4 |
2 files changed, 2 insertions, 31 deletions
diff --git a/src/mingw-w64-2-netioapi-winxp.patch b/src/mingw-w64-2-netioapi-winxp.patch deleted file mode 100644 index 7b13a5a..0000000 --- a/src/mingw-w64-2-netioapi-winxp.patch +++ /dev/null @@ -1,29 +0,0 @@ -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, diff --git a/src/mingw-w64.mk b/src/mingw-w64.mk index fffd282..877a53d 100644 --- a/src/mingw-w64.mk +++ b/src/mingw-w64.mk @@ -3,8 +3,8 @@ PKG := mingw-w64 $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.0 -$(PKG)_CHECKSUM := d31eac960d42e791970697eae5724e529c81dcd6 +$(PKG)_VERSION := 4.0.0 +$(PKG)_CHECKSUM := 7aa74e088770b0c6122abf4d53976c7cce76af51 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE) |