diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-09-24 14:35:49 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-09-24 15:36:17 (GMT) |
| commit | aabd12223bda6260756ab19430082477d5669c0a (patch) | |
| tree | 6ca7a12e627915992cfd0038f6ddd8ee244711f4 /src/3rdparty/javascriptcore/JavaScriptCore/os-win32 | |
| parent | 270c374c178ec5a532d37168b018cd7ebc844558 (diff) | |
| download | Qt-aabd12223bda6260756ab19430082477d5669c0a.zip Qt-aabd12223bda6260756ab19430082477d5669c0a.tar.gz Qt-aabd12223bda6260756ab19430082477d5669c0a.tar.bz2 | |
Update src/3rdparty/javascriptcore and adapt src/script to the changes.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/os-win32')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdbool.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdbool.h b/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdbool.h index 8e7bace..fc8ee28 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdbool.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdbool.h @@ -21,8 +21,8 @@ #ifndef STDBOOL_WIN32_H #define STDBOOL_WIN32_H -#if !PLATFORM(WIN_OS) -#error "This stdbool.h file should only be compiled under Windows" +#if !COMPILER(MSVC) +#error "This stdbool.h file should only be compiled with MSVC" #endif #ifndef __cplusplus diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h b/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h index efab2ae..1d8787e 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/os-win32/stdint.h @@ -23,10 +23,11 @@ #include <wtf/Platform.h> -/* This file emulates enough of stdint.h on Windows to make JavaScriptCore and WebCore compile. */ +/* This file emulates enough of stdint.h on Windows to make JavaScriptCore and WebCore + compile using MSVC which does not ship with the stdint.h header. */ -#if !PLATFORM(WIN_OS) -#error "This stdint.h file should only be compiled under Windows" +#if !COMPILER(MSVC) +#error "This stdint.h file should only be compiled with MSVC" #endif #include <limits.h> |