[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
hausmann at webkit.org
hausmann at webkit.org
Wed Jan 20 22:27:41 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit b16a364b1d72b792ed2bf35d4b9facc0483aebb6
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 18 09:54:51 2010 +0000
Fix the build with strict gcc and RVCT versions: It's not legal to cast a
pointer to a function to a void* without an intermediate cast to a non-pointer
type. A cast to a ptrdiff_t inbetween fixes it.
Reviewed by Kenneth Rohde Christiansen.
* runtime/JSString.h:
(JSC::Fiber::JSString):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53397 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c3baea1..2c549e8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-18 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Fix the build with strict gcc and RVCT versions: It's not legal to cast a
+ pointer to a function to a void* without an intermediate cast to a non-pointer
+ type. A cast to a ptrdiff_t inbetween fixes it.
+
+ * runtime/JSString.h:
+ (JSC::Fiber::JSString):
+
2010-01-15 Gavin Barraclough <barraclough at apple.com>
Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/runtime/JSString.h b/JavaScriptCore/runtime/JSString.h
index 4a10df0..3fd43a8 100644
--- a/JavaScriptCore/runtime/JSString.h
+++ b/JavaScriptCore/runtime/JSString.h
@@ -258,7 +258,7 @@ namespace JSC {
, m_ropeLength(0)
{
// nasty hack because we can't union non-POD types
- m_fibers[0] = reinterpret_cast<void*>(finalizer);
+ m_fibers[0] = reinterpret_cast<void*>(reinterpret_cast<ptrdiff_t>(finalizer));
m_fibers[1] = context;
Heap::heap(this)->reportExtraMemoryCost(value.cost());
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list