diff options
| author | Andreas Kling <andreas.kling@nokia.com> | 2010-01-20 09:26:25 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-01-20 09:26:25 (GMT) |
| commit | 877d63b35b290649e745e08be104c81dc56a02b9 (patch) | |
| tree | 6817a7001f20cbc9adb31844683122db03ed9fd0 /src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h | |
| parent | 01f733a64e45363e74bea62e4cae8a658bc09383 (diff) | |
| parent | 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d (diff) | |
| download | Qt-877d63b35b290649e745e08be104c81dc56a02b9.zip Qt-877d63b35b290649e745e08be104c81dc56a02b9.tar.gz Qt-877d63b35b290649e745e08be104c81dc56a02b9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h index ecdd997..f355c53 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/Structure.h @@ -45,12 +45,6 @@ #define DUMP_PROPERTYMAP_STATS 0 #endif -#if COMPILER(RVCT) -#pragma arm -#pragma Otime -#pragma O3 -#endif - namespace JSC { class MarkStack; |