[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 16:12:27 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 69edcb80d63774872d1dc7817cc825decb61abe6
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 19 17:16:54 2010 +0000
2010-11-19 Patrick Gansterer <paroga at webkit.org>
Unreviewed, build fix after r72360.
* bytecode/CodeBlock.h:
(JSC::CodeBlock::bytecodeOffset):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72411 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 820cad8..1ba8606 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-19 Patrick Gansterer <paroga at webkit.org>
+
+ Unreviewed, build fix after r72360.
+
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlock::bytecodeOffset):
+
2010-11-18 Gavin Barraclough <barraclough at apple.com>
Rubber stamped by Geoff Garen.
diff --git a/JavaScriptCore/bytecode/CodeBlock.h b/JavaScriptCore/bytecode/CodeBlock.h
index 5b09b4a..12624e0 100644
--- a/JavaScriptCore/bytecode/CodeBlock.h
+++ b/JavaScriptCore/bytecode/CodeBlock.h
@@ -335,7 +335,7 @@ namespace JSC {
}
#endif
#if ENABLE(INTERPRETER)
- unsigned bytecodeOffset(CallFrame*, Instruction* returnAddress)
+ unsigned bytecodeOffset(Instruction* returnAddress)
{
return static_cast<Instruction*>(returnAddress) - instructions().begin();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list