diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2013-04-24 09:08:59 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-29 05:31:19 (GMT) |
| commit | a40b9b2b2de0880ea74399fd5d7a842396dd31e7 (patch) | |
| tree | faf608f1216fd75d9d29c47ebb9b881708e0727b /src | |
| parent | 06a2d65f92cf062c4906366c1835b27d91467fbc (diff) | |
| download | Qt-a40b9b2b2de0880ea74399fd5d7a842396dd31e7.zip Qt-a40b9b2b2de0880ea74399fd5d7a842396dd31e7.tar.gz Qt-a40b9b2b2de0880ea74399fd5d7a842396dd31e7.tar.bz2 | |
Revert "JSCore build fix for WEC7"
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 <Friedemann.Kleint@digia.com>
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index e95ac7f..17c06bf 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 <class T> inline T max(const T& a, const T& b) { return (a > b) ? a : b; } - template <class T> inline T min(const T& a, const T& b) { return (a < b) ? a : b; } - } -#endif - -// For localtime in Windows CE # include <ce_time.h> #endif |