[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 16:17:00 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3e647da2aceb533b94180cf421ea4f19c7aae1ee
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 20 23:34:43 2010 +0000

    2010-11-20  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by David Kilzer.
    
            [BREWMP] Use std_wstrlen instead of WSTRLEN
            https://bugs.webkit.org/show_bug.cgi?id=49516
    
            WSTRLEN is prohibited in Mod1. Use std_wstrlen from AEEstd.h instead.
    
            * platform/text/brew/StringBrew.cpp:
            (WTF::String::String):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5f2a69a..d16b676 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-20  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by David Kilzer.
+
+        [BREWMP] Use std_wstrlen instead of WSTRLEN
+        https://bugs.webkit.org/show_bug.cgi?id=49516
+
+        WSTRLEN is prohibited in Mod1. Use std_wstrlen from AEEstd.h instead.
+
+        * platform/text/brew/StringBrew.cpp:
+        (WTF::String::String):
+
 2010-11-20  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by David Kilzer.
diff --git a/WebCore/platform/text/brew/StringBrew.cpp b/WebCore/platform/text/brew/StringBrew.cpp
index 7869e0f..2da81e3 100644
--- a/WebCore/platform/text/brew/StringBrew.cpp
+++ b/WebCore/platform/text/brew/StringBrew.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "PlatformString.h"
 
-#include <AEEStdLib.h>
+#include <AEEstd.h>
 
 namespace WTF {
 
@@ -35,7 +35,7 @@ String::String(const AECHAR* string)
 {
     // It is safe to cast AECHAR to UChar as both of them use 16 bits representation.
     const UChar* str = reinterpret_cast<const UChar*>(string);
-    const size_t len = WSTRLEN(string);
+    const size_t len = std_wstrlen(string);
 
     m_impl = StringImpl::create(str, len);
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list