dsc
/
mxe
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mingw-w64: normalise patch

Browse Source 
The previous update[1] left the patch in a state where it was applying
the same changeset twice with an incorrect commit message[2] for patch 2

[1] 8ed36bf81f
[2] 8ed36bf81f/src/mingw-w64-1.patch
pull/2520/head
Tony Theodore 4 years ago
parent 4e15526c18
commit 85943eb437
2 changed files with 31 additions and 61 deletions
Show Stats Download Patch File Download Diff File

31
src/mingw-w64-1-fixes.patch
Unescape View File

@ -0,0 +1,31 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 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/1] 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 1111111..2222222 100644
--- a/mingw-w64-headers/crt/float.h
+++ b/mingw-w64-headers/crt/float.h
@@ -114,6 +114,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

61
src/mingw-w64-1.patch
Unescape View File

@ -1,61 +0,0 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 0000000000000000000000000000000000000000 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 1111111..2222222 100644
--- a/mingw-w64-headers/crt/float.h
+++ b/mingw-w64-headers/crt/float.h
@@ -114,6 +114,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
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Fri, 22 Dec 2017 13:01:03 +0000
Subject: [PATCH 2/2] dwmapi.def: Regenegerate from Windows 10
Remove ordinals from x86 library too.
Signed-off-by: Jonathan Yong <10walls@gmail.com>
Taken from: https://sourceforge.net/p/mingw-w64/mailman/message/36166386/
diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
index 1111111..2222222 100644
--- a/mingw-w64-headers/crt/float.h
+++ b/mingw-w64-headers/crt/float.h
@@ -114,6 +114,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__
+
/* 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
Write Preview
Loading…
Cancel
Save