diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-07-29 07:26:08 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-07-29 07:26:08 (GMT) |
| commit | a7cc30b30df53d6a70208c25f6c12a9f229b3ea6 (patch) | |
| tree | 7764192081a6f36113bc7c2f32419fa36ed7013b /src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h | |
| parent | fb7d86cf23227302d48db279ec589221d11a1f6a (diff) | |
| parent | 3b00ee50810206a20a5bb1b06e1dfaf593aae7ed (diff) | |
| download | Qt-a7cc30b30df53d6a70208c25f6c12a9f229b3ea6.zip Qt-a7cc30b30df53d6a70208c25f6c12a9f229b3ea6.tar.gz Qt-a7cc30b30df53d6a70208c25f6c12a9f229b3ea6.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h index ad66d06..59efd84 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Assertions.h @@ -136,8 +136,8 @@ void WTFLogVerbose(const char* file, int line, const char* function, WTFLogChann #undef ERROR #endif -#if PLATFORM(WIN_OS) -/* FIXME: Change to use something other than ASSERT to avoid this conflict with win32. */ +#if PLATFORM(WIN_OS) || PLATFORM(SYMBIAN) +/* FIXME: Change to use something other than ASSERT to avoid this conflict with the underlying platform */ #undef ASSERT #endif |