diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-03-29 12:57:28 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-03-29 13:04:53 (GMT) |
| commit | 182394008e63b1a977b5f6edd3d8c129fe2dce34 (patch) | |
| tree | 29d567445faa120cd96b3bfe2967f75b1e7c75da /src/mingw-w64-1.patch | |
| parent | a8df43d1324294522bde66f2c5d5f9f6d43476e6 (diff) | |
| download | mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.zip mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.tar.gz mxe-182394008e63b1a977b5f6edd3d8c129fe2dce34.tar.bz2 | |
mingw-w64: fix the shlobj.h problem at the source
Diffstat (limited to 'src/mingw-w64-1.patch')
| -rw-r--r-- | src/mingw-w64-1.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/src/mingw-w64-1.patch b/src/mingw-w64-1.patch new file mode 100644 index 0000000..f8d3208 --- /dev/null +++ b/src/mingw-w64-1.patch @@ -0,0 +1,62 @@ +This file is part of MXE. +See index.html for further information. + +From 8de1a5d893f5eba0d54731ad4eeff4b0128798be 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 + +https://bugzilla.redhat.com/show_bug.cgi?id=843436 + +diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h +index 5874f4e..c031ce0 100644 +--- a/mingw-w64-headers/crt/float.h ++++ b/mingw-w64-headers/crt/float.h +@@ -105,6 +105,15 @@ + #define DBL_MAX_10_EXP __DBL_MAX_10_EXP__ + #define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ + ++ /* The difference between 1 and the least value greater than 1 that is ++ representable in the given floating point type, b**1-p. */ ++ #undef FLT_EPSILON ++ #undef DBL_EPSILON ++ #undef LDBL_EPSILON ++ #define FLT_EPSILON __FLT_EPSILON__ ++ #define DBL_EPSILON __DBL_EPSILON__ ++ #define LDBL_EPSILON __LDBL_EPSILON__ ++ + /* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown. */ + /* ??? 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 + |