summaryrefslogtreecommitdiffstats
path: root/src/mingw-w64-1.patch
blob: f8d3208216e3eb09ac9aebd52d57b5f4132fceb7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
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