From a40b9b2b2de0880ea74399fd5d7a842396dd31e7 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 24 Apr 2013 11:08:59 +0200 Subject: Revert "JSCore build fix for WEC7" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I's reverted, because there seems to be at least two implementations of the stl in WEC7. One for each BSP SDK and one shipped with the compiler, which is in this case Visual Studio 2008. The Compiler has a stl with std::min etc. Visual Studio GUI also uses the compiler version of the stl first. It seems to be that the environment was setup wrongly. Checksdk also uses the right order. The same patch is reverted for Qt5 as well: https://codereview.qt-project.org/25482 This reverts commit 1fba05343eb6fea40f6617a62e31e10a0e918ec2 Change-Id: I956cc6f0669c67a094a2af464f8aa719a137a7a5 Reviewed-by: Friedemann Kleint Reviewed-by: Björn Breitmeyer Reviewed-by: Miikka Heikkinen --- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index e95ac7f8b7..17c06bf48d 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -546,17 +546,6 @@ # define WTF_CPU_BIG_ENDIAN 1 # endif -#if (_WIN32_WCE >= 0x700) - // Windows Embedded Compact 7 is missing std::ptrdiff_t type and std::min and std::max. - // They are defined here to minimize the changes to JSCore - namespace std { - typedef ::ptrdiff_t ptrdiff_t; - template inline T max(const T& a, const T& b) { return (a > b) ? a : b; } - template inline T min(const T& a, const T& b) { return (a < b) ? a : b; } - } -#endif - -// For localtime in Windows CE # include #endif -- cgit v1.2.3