[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 08174bb069388e056819ed3bf17c0333842518a3
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 20 04:39:20 2009 +0000

    2009-10-19  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Eric Seidel.
    
            Check COMPILER(MSVC) instead of PLATFORM(WIN_OS) to avoid the use of vasprintf.
            https://bugs.webkit.org/show_bug.cgi?id=30473
    
            vasprintf is missing in MSVC. Use COMPILER(MSVC) guards instead of
            PLALTFORM(WIN_OS) guards.
    
            * dom/XMLTokenizerLibxml2.cpp:
            (WebCore::XMLTokenizer::error):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49838 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6c0f495..85fff78 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-19  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Eric Seidel.
+
+        Check COMPILER(MSVC) instead of PLATFORM(WIN_OS) to avoid the use of vasprintf.
+        https://bugs.webkit.org/show_bug.cgi?id=30473
+
+        vasprintf is missing in MSVC. Use COMPILER(MSVC) guards instead of
+        PLALTFORM(WIN_OS) guards.
+
+        * dom/XMLTokenizerLibxml2.cpp:
+        (WebCore::XMLTokenizer::error):
+
 2009-10-19  Jungshik Shin  <jshin at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/dom/XMLTokenizerLibxml2.cpp b/WebCore/dom/XMLTokenizerLibxml2.cpp
index 2942241..6cc0a0c 100644
--- a/WebCore/dom/XMLTokenizerLibxml2.cpp
+++ b/WebCore/dom/XMLTokenizerLibxml2.cpp
@@ -887,7 +887,7 @@ void XMLTokenizer::error(ErrorType type, const char* message, va_list args)
     if (m_parserStopped)
         return;
 
-#if PLATFORM(WIN_OS)
+#if COMPILER(MSVC)
     char m[1024];
     vsnprintf(m, sizeof(m) - 1, message, args);
 #else
@@ -901,7 +901,7 @@ void XMLTokenizer::error(ErrorType type, const char* message, va_list args)
     else
         handleError(type, m, lineNumber(), columnNumber());
 
-#if !PLATFORM(WIN_OS)
+#if !COMPILER(MSVC)
     free(m);
 #endif
 }

-- 
WebKit Debian packaging