[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
barraclough at apple.com
barraclough at apple.com
Wed Dec 22 11:56:35 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0c3b7f605860faeee1f391ee8dff618e8e2b9b9f
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 11 22:16:50 2010 +0000
Windows build fix.
* platform/win/BString.cpp:
(WebCore::BString::BString):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65190 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7254803..9a2ebdc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2010-08-11 Gavin Barraclough <barraclough at apple.com>
+ Windows build fix.
+
+ * platform/win/BString.cpp:
+ (WebCore::BString::BString):
+
+2010-08-11 Gavin Barraclough <barraclough at apple.com>
+
Qt build fix II.
* WebCore.xcodeproj/project.pbxproj:
diff --git a/WebCore/platform/win/BString.cpp b/WebCore/platform/win/BString.cpp
index a23a38c..4d6d11e 100644
--- a/WebCore/platform/win/BString.cpp
+++ b/WebCore/platform/win/BString.cpp
@@ -90,7 +90,7 @@ BString::BString(const UString& s)
if (s.isNull())
m_bstr = 0;
else
- m_bstr = SysAllocStringLen(s.data(), s.size());
+ m_bstr = SysAllocStringLen(s.characters(), s.length());
}
#if PLATFORM(CF)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list