diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:22:33 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:55:19 (GMT) |
| commit | 87e162b304d388a5ac81c4e285fa0a63a0c8c5ab (patch) | |
| tree | 7b4182728b4882338f81ec53749f42251bd3376e /src/3rdparty/javascriptcore/JavaScriptCore/API | |
| parent | dcb4ce170725207d11994eff6bc9a4bb6b56fc2c (diff) | |
| download | Qt-87e162b304d388a5ac81c4e285fa0a63a0c8c5ab.zip Qt-87e162b304d388a5ac81c4e285fa0a63a0c8c5ab.tar.gz Qt-87e162b304d388a5ac81c4e285fa0a63a0c8c5ab.tar.bz2 | |
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-07042010 ( 706b04f3796e60078c28335beb5f24a7b27cd328 )
Fix the Qt build on Mac OS X/Cocoa 64-bit
[Qt] Symbian specific getCPUTime implemetation
https://bugs.webkit.org/show_bug.cgi?id=34742
Fix the SP at ctiOpThrowNotCaught on Thumb2 (JSVALUE32)
https://bugs.webkit.org/show_bug.cgi?id=34939
Add missing cast for !YARR (PPC) builds.
Implement NEVER_INLINE and NO_RETURN for RVCT
https://bugs.webkit.org/show_bug.cgi?id=34740
Typedef both JSChar and UChar to wchar_t in RVCT.
https://bugs.webkit.org/show_bug.cgi?id=34560
Get rid of WINSCW hack for UnSpecifiedBoolType
https://bugs.webkit.org/show_bug.cgi?id=28054
[Qt] use nanval() for Symbian as nonInlineNaN
https://bugs.webkit.org/show_bug.cgi?id=34170
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/API')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.h b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.h index c58b958..92135b1 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSStringRef.h @@ -37,7 +37,8 @@ extern "C" { #endif -#if !defined(WIN32) && !defined(_WIN32) && !defined(__WINSCW__) +#if !defined(WIN32) && !defined(_WIN32) && !defined(__WINSCW__) \ + && !(defined(__CC_ARM) || defined(__ARMCC__)) /* RVCT */ /*! @typedef JSChar @abstract A Unicode character. |