From db84d1737cb70244eef271b91d1cea61c3e76963 Mon Sep 17 00:00:00 2001 From: Kai Koehne <kai.koehne@digia.com> Date: Wed, 1 Oct 2014 14:45:21 +0200 Subject: [PATCH] Fix MinGW build (even more) Task-number: QTBUG-41673 Change-Id: If58284dc3c02b80abae759924b3e822842e94ee1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp | 3 ++- src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp index a6eb0d63..a2a4d30a 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp @@ -74,7 +74,6 @@ #include "Assertions.h" #include "ASCIICType.h" #include "CurrentTime.h" -#include "MathExtras.h" #include "StringExtras.h" #include <algorithm> @@ -105,6 +104,8 @@ extern "C" struct tm * localtime(const time_t *timer); #include "CallFrame.h" #endif +#include "MathExtras.h" + #define NaN std::numeric_limits<double>::quiet_NaN() using namespace WTF; diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp index fe650425..97c6c8f5 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/dtoa.cpp @@ -147,12 +147,13 @@ #include <wtf/AlwaysInline.h> #include <wtf/Assertions.h> #include <wtf/FastMalloc.h> -#include <wtf/MathExtras.h> #include <wtf/Vector.h> #include <wtf/Threading.h> #include <stdio.h> +#include <wtf/MathExtras.h> + #if COMPILER(MSVC) #pragma warning(disable: 4244) #pragma warning(disable: 4245) -- GitLab