[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
oliver at apple.com
oliver at apple.com
Wed Dec 22 13:05:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 906a13cf03c5319ea2eb77c8773beafbe6f134de
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 6 23:31:09 2010 +0000
Windows build fix
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66854 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 12cb66f..a6a6450 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -5,6 +5,13 @@
* bindings/js/SerializedScriptValue.cpp:
(WebCore::CloneSerializer::write):
+2010-09-06 Oliver Hunt <oliver at apple.com>
+
+ Windows build fix
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneSerializer::write):
+
2010-09-05 Oliver Hunt <oliver at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/bindings/js/SerializedScriptValue.cpp b/WebCore/bindings/js/SerializedScriptValue.cpp
index 6bdb67f..92c8936 100644
--- a/WebCore/bindings/js/SerializedScriptValue.cpp
+++ b/WebCore/bindings/js/SerializedScriptValue.cpp
@@ -505,7 +505,7 @@ private:
}
writeLittleEndian<uint32_t>(m_buffer, str.length());
- if (!writeLittleEndian<uint16_t>(m_buffer, str.characters(), str.length()))
+ if (!writeLittleEndian<uint16_t>(m_buffer, reinterpret_cast<const uint16_t*>(str.characters()), str.length()))
fail();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list