diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-13 22:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-13 22:00:15 (GMT) |
| commit | 8399cce50eb11db885e67a52055505951309cae8 (patch) | |
| tree | 56518186c2835fadec353feef725328f85ba4e25 /src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h | |
| parent | 0e4083ba5bf1bbc581d072b016fb977fb1f846c1 (diff) | |
| parent | 870ecb5b44a56b29d16a4819c2d92298801cf98f (diff) | |
| download | Qt-8399cce50eb11db885e67a52055505951309cae8.zip Qt-8399cce50eb11db885e67a52055505951309cae8.tar.gz Qt-8399cce50eb11db885e67a52055505951309cae8.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h b/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h index 509daeb..f7f53fd 100644 --- a/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h +++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/Opcode.h @@ -206,7 +206,7 @@ namespace JSC { #undef VERIFY_OPCODE_ID #if HAVE(COMPUTED_GOTO) -#if COMPILER(RVCT) +#if COMPILER(RVCT) || COMPILER(INTEL) typedef void* Opcode; #else typedef const void* Opcode; |