diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:36:49 (GMT) |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2010-04-07 16:55:21 (GMT) |
| commit | 26466aca454bec1117a13af41b12efa66f4a6567 (patch) | |
| tree | aecf02391a69607b9df6ecb163fa1fcbf21fe7bd /src/3rdparty | |
| parent | 26c2c1dbad1cdeec77497ff6f1085f49d831b921 (diff) | |
| download | Qt-26466aca454bec1117a13af41b12efa66f4a6567.zip Qt-26466aca454bec1117a13af41b12efa66f4a6567.tar.gz Qt-26466aca454bec1117a13af41b12efa66f4a6567.tar.bz2 | |
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-07042010 ( 3b44f0650780e009764ddc0aa6eba7234a85aa72 )
Corrected name of (u)int64_t compile time assert.
https://bugs.webkit.org/show_bug.cgi?id=36739
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog | 11 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/VERSION | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog index 3e8cb66..e2e1786 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog +++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog @@ -1,3 +1,14 @@ +2010-03-29 Patrick Gansterer <paroga@paroga.com> + + Reviewed by Darin Adler. + + Corrected name of (u)int64_t compile time assert. + https://bugs.webkit.org/show_bug.cgi?id=36739 + + int64_t_is_four_bytes -> int64_t_is_eight_bytes + + * os-win32/stdint.h: + 2010-03-23 Mark Rowe <mrowe@apple.com> Build fix. diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h b/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h index 1d8787e..b5dff56 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h @@ -61,7 +61,7 @@ CASSERT(sizeof(int16_t) == 2, int16_t_is_two_bytes) CASSERT(sizeof(uint16_t) == 2, uint16_t_is_two_bytes) CASSERT(sizeof(int32_t) == 4, int32_t_is_four_bytes) CASSERT(sizeof(uint32_t) == 4, uint32_t_is_four_bytes) -CASSERT(sizeof(int64_t) == 8, int64_t_is_four_bytes) -CASSERT(sizeof(uint64_t) == 8, uint64_t_is_four_bytes) +CASSERT(sizeof(int64_t) == 8, int64_t_is_eight_bytes) +CASSERT(sizeof(uint64_t) == 8, uint64_t_is_eight_bytes) #endif diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION index c9861de..7a0b7a7 100644 --- a/src/3rdparty/javascriptcore/VERSION +++ b/src/3rdparty/javascriptcore/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 42ad198e900e439f01d2062ad93d03043c68a309 + 3b44f0650780e009764ddc0aa6eba7234a85aa72 |