diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-08-05 07:18:53 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-08-05 23:14:09 (GMT) |
| commit | 661fa057c2f8435abf0ac8c817eea5d58df30577 (patch) | |
| tree | b748771a344414e3d7bf1889935754e27f2fe1a3 /src/mingw-w64-1.patch | |
| parent | ba8dbe0fb7e1f6ddc2e4b49dc360a174c6290696 (diff) | |
| download | mxe-661fa057c2f8435abf0ac8c817eea5d58df30577.zip mxe-661fa057c2f8435abf0ac8c817eea5d58df30577.tar.gz mxe-661fa057c2f8435abf0ac8c817eea5d58df30577.tar.bz2 | |
mingw-w64: update
Diffstat (limited to 'src/mingw-w64-1.patch')
| -rw-r--r-- | src/mingw-w64-1.patch | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/src/mingw-w64-1.patch b/src/mingw-w64-1.patch index f8d3208..24587ea 100644 --- a/src/mingw-w64-1.patch +++ b/src/mingw-w64-1.patch @@ -1,10 +1,10 @@ This file is part of MXE. See index.html for further information. -From 8de1a5d893f5eba0d54731ad4eeff4b0128798be Mon Sep 17 00:00:00 2001 +From 1b750c225c874854ed1fc254b6bee7c50376d537 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 29 Mar 2015 14:36:38 +0200 -Subject: [PATCH 1/2] workaround for -isystem flag messing up include order +Subject: [PATCH] workaround for -isystem flag messing up include order https://bugzilla.redhat.com/show_bug.cgi?id=843436 @@ -29,34 +29,5 @@ index 5874f4e..c031ce0 100644 /* ??? This is supposed to change with calls to fesetround in <fenv.h>. */ #undef FLT_ROUNDS -- -2.1.0 - - -From 0637bae1999f6dcd7932d1d844db57f1e0c6104c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= - =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com> -Date: Wed, 18 Mar 2015 14:06:33 +0000 -Subject: [PATCH 2/2] Add more includes to shlobj.h - -wtypesbase.h and wincrypt.h pull some other headers, -together they all provide EXTERN_C, DECLSPEC_IMPORT and WINAPI macros, -which are needed by shlobj.h directly or indirectly. - -(cherry picked from commit 6c56d0b0eb5be9fbeb552ba070a2304b842a5102) - -diff --git a/mingw-w64-headers/include/shlobj.h b/mingw-w64-headers/include/shlobj.h -index 3d2e21c..be087c4 100644 ---- a/mingw-w64-headers/include/shlobj.h -+++ b/mingw-w64-headers/include/shlobj.h -@@ -6,6 +6,8 @@ - #ifndef _SHLOBJ_H_ - #define _SHLOBJ_H_ - -+#include <wtypesbase.h> -+#include <wincrypt.h> - #include <winapifamily.h> - - #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || defined(WINSTORECOMPAT) --- -2.1.0 +2.1.4 |