[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
ap at apple.com
ap at apple.com
Wed Dec 22 18:28:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 73d4e04241a0bc9a634557e4ab5426606f8b9030
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Dec 11 07:21:02 2010 +0000
Mac build fix.
* platform/network/cf/ResourceResponseCFNet.cpp: (WebCore::ResourceResponse::platformLazyInit):
Resolve string[0] ambiguity by passing 0U.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73844 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 98b5dc8..ef15caf 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-10 Alexey Proskuryakov <ap at apple.com>
+
+ Mac build fix.
+
+ * platform/network/cf/ResourceResponseCFNet.cpp: (WebCore::ResourceResponse::platformLazyInit):
+ Resolve string[0] ambiguity by passing 0U.
+
2010-12-10 Steve Falkenburg <sfalken at apple.com>
Windows production build fix.
diff --git a/WebCore/platform/network/cf/ResourceResponseCFNet.cpp b/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
index ebeff41..9a83add 100644
--- a/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
+++ b/WebCore/platform/network/cf/ResourceResponseCFNet.cpp
@@ -81,7 +81,7 @@ void ResourceResponse::platformLazyInit()
// Workaround for <rdar://problem/8757088>, can be removed once that is fixed.
unsigned textEncodingNameLength = m_textEncodingName.length();
- if (textEncodingNameLength >= 2 && m_textEncodingName[0] == '"' && m_textEncodingName[textEncodingNameLength - 1] == '"')
+ if (textEncodingNameLength >= 2 && m_textEncodingName[0U] == '"' && m_textEncodingName[textEncodingNameLength - 1] == '"')
m_textEncodingName = m_textEncodingName.substring(1, textEncodingNameLength - 2);
m_lastModifiedDate = toTimeT(CFURLResponseGetLastModifiedDate(m_cfResponse.get()));
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list