[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 98416ab13ed424b6fb008a1e393d9411023a32e6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 04:20:33 2010 +0000

    2010-01-26  Lyon Chen  <liachen at rim.com>
    
            Reviewed by Maciej Stachowiak.
    
            Opcode.h use const void* for Opcode cause error #1211 for RVCT compiler
            https://bugs.webkit.org/show_bug.cgi?id=33902
    
            * bytecode/Opcode.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53891 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index a6b90c9..eefd729 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-26  Lyon Chen  <liachen at rim.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Opcode.h use const void* for Opcode cause error #1211 for RVCT compiler
+        https://bugs.webkit.org/show_bug.cgi?id=33902
+
+        * bytecode/Opcode.h:
+
 2010-01-26  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/bytecode/Opcode.h b/JavaScriptCore/bytecode/Opcode.h
index b11113b..d9b2153 100644
--- a/JavaScriptCore/bytecode/Opcode.h
+++ b/JavaScriptCore/bytecode/Opcode.h
@@ -196,7 +196,11 @@ namespace JSC {
     #undef VERIFY_OPCODE_ID
 
 #if HAVE(COMPUTED_GOTO)
+#if COMPILER(RVCT)
+    typedef void* Opcode;
+#else
     typedef const void* Opcode;
+#endif
 #else
     typedef OpcodeID Opcode;
 #endif

-- 
WebKit Debian packaging