diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 18:04:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 18:04:58 (GMT) |
| commit | 8f9d65125dc29b83d133fb879bf934bee74720fa (patch) | |
| tree | b8ee81cfc343cdb0971dde87a29fddec87547d4c /src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h | |
| parent | f101d46ccd4795fc672b5b6c9e24151df319d725 (diff) | |
| parent | 133c95d4e422300305620b5d6bebad65b31f8278 (diff) | |
| download | Qt-8f9d65125dc29b83d133fb879bf934bee74720fa.zip Qt-8f9d65125dc29b83d133fb879bf934bee74720fa.tar.gz Qt-8f9d65125dc29b83d133fb879bf934bee74720fa.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 540ae4ccd25609e1bfe1673195ce126255e36774
Updated WebKit to 2c346f58ae70470d88dcd856bfe59b04a144b65a
Updated WebKit to 1a40220a82197023c1b1ac6eff027be6dd3168d3
Updated WebKit to 2992802f35fd47e32bb94a4b1f48cce7ec7fda9d
Updated WebKit to 862268aeb7150d3795d05bfc05f661bb5c598a27
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h index 0e02af5..8b6d09a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h @@ -61,7 +61,7 @@ #define ASSERTIONS_DISABLED_DEFAULT 0 #endif -#if COMPILER(MSVC7) || COMPILER(WINSCW) +#if COMPILER(MSVC7_OR_LOWER) || COMPILER(WINSCW) #define HAVE_VARIADIC_MACRO 0 #else #define HAVE_VARIADIC_MACRO 1 @@ -213,7 +213,7 @@ while (0) /* ASSERT_WITH_MESSAGE */ -#if COMPILER(MSVC7) +#if COMPILER(MSVC7_OR_LOWER) #define ASSERT_WITH_MESSAGE(assertion) ((void)0) #elif COMPILER(WINSCW) #define ASSERT_WITH_MESSAGE(assertion, arg...) ((void)0) @@ -253,7 +253,7 @@ while (0) /* FATAL */ -#if COMPILER(MSVC7) +#if COMPILER(MSVC7_OR_LOWER) #define FATAL() ((void)0) #elif COMPILER(WINSCW) #define FATAL(arg...) ((void)0) @@ -268,7 +268,7 @@ while (0) /* LOG_ERROR */ -#if COMPILER(MSVC7) +#if COMPILER(MSVC7_OR_LOWER) #define LOG_ERROR() ((void)0) #elif COMPILER(WINSCW) #define LOG_ERROR(arg...) ((void)0) @@ -280,7 +280,7 @@ while (0) /* LOG */ -#if COMPILER(MSVC7) +#if COMPILER(MSVC7_OR_LOWER) #define LOG() ((void)0) #elif COMPILER(WINSCW) #define LOG(arg...) ((void)0) @@ -294,7 +294,7 @@ while (0) /* LOG_VERBOSE */ -#if COMPILER(MSVC7) +#if COMPILER(MSVC7_OR_LOWER) #define LOG_VERBOSE(channel) ((void)0) #elif COMPILER(WINSCW) #define LOG_VERBOSE(channel, arg...) ((void)0) |