diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-10-01 14:45:21 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2014-10-01 14:54:44 +0200 |
| commit | db84d1737cb70244eef271b91d1cea61c3e76963 (patch) | |
| tree | 68be2661c918117600889451c9eb59e0267024f9 | |
| parent | b5d82dbedbcfd290cba022a52656f9c208d11d65 (diff) | |
| download | qtscript-db84d1737cb70244eef271b91d1cea61c3e76963.tar.gz | |
Fix MinGW build (even more)v5.4.0-beta1
Task-number: QTBUG-41673
Change-Id: If58284dc3c02b80abae759924b3e822842e94ee1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/DateMath.cpp | 3 | ||||
| -rw-r--r-- | 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 a6eb0d6..a2a4d30 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 fe65042..97c6c8f 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) |