# HG changeset patch # User Markus Mützel # Date 1641382605 -3600 # Node ID 366839a6e6ef650b800098fb4d5143e94c6482a2 # Parent fc663bd5f260fd442902c073570a3fb8ffbb8dcb mingw-w64: Remove patch. * src/mingw-w64-1-float-h.patch: Remove patch that has been applied upstream (at an offset). * dist-files.mk: Remove deleted file from dist. diff -r fc663bd5f260 -r 366839a6e6ef dist-files.mk --- a/dist-files.mk Sat Jan 01 21:39:48 2022 +0100 +++ b/dist-files.mk Wed Jan 05 12:36:45 2022 +0100 @@ -358,7 +358,6 @@ mingw-texinfo-1-fixes.patch \ mingw-texinfo-2-makeinfo-non-ASCII-perl.patch \ mingw-utils-1-portability-fix.patch \ - mingw-w64-1-float-h.patch \ mingw-w64.mk \ mingw-zeromq-1-fixes.patch \ mingwrt.mk \ diff -r fc663bd5f260 -r 366839a6e6ef src/mingw-w64-1-float-h.patch --- a/src/mingw-w64-1-float-h.patch Sat Jan 01 21:39:48 2022 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -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 -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 . */ - #undef FLT_ROUNDS