diff options
| author | jaanttil <janne.anttila@digia.com> | 2011-08-24 05:54:41 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 13:59:55 (GMT) |
| commit | 7f8612853273f9dc120a7bc096f10821eb48fd2b (patch) | |
| tree | 82f83b58e819bb0823f5f450805dffd674b2f733 /src/3rdparty | |
| parent | e93c5aae8366d430d69827d409f3b6d31eb5dfb6 (diff) | |
| download | Qt-7f8612853273f9dc120a7bc096f10821eb48fd2b.zip Qt-7f8612853273f9dc120a7bc096f10821eb48fd2b.tar.gz Qt-7f8612853273f9dc120a7bc096f10821eb48fd2b.tar.bz2 | |
JSCore build fix for WEC7
WEC7 does not have std::ptrdiff_t type and std::min/std::max,
introduced the missing types and functions in JSCore platform.h
Task-number: QTBUG-22497
Change-Id: I0bf2bff2a80bdff36253f233b30cc95e1c772e23
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index cb4a963..700977e 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -546,6 +546,17 @@ # 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 |