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

[jorlow at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 64980ae765494be018a09aaa4ff42f390db2cd40
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 23:33:35 2009 +0000

    Build fix for http://trac.webkit.org/changeset/49272 on Windows
    
    Patch by Jeremy Orlow <jorlow at chromium.org> on 2009-10-07
    * platform/text/StringImpl.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49274 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f71b904..9caeaeb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-07  Jeremy Orlow  <jorlow at chromium.org>
+
+        Build fix for http://trac.webkit.org/changeset/49272 on Windows
+
+        * platform/text/StringImpl.h:
+
 2009-10-07  Jens Alfke  <snej at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/text/StringImpl.h b/WebCore/platform/text/StringImpl.h
index 9931ac7..4f101e6 100644
--- a/WebCore/platform/text/StringImpl.h
+++ b/WebCore/platform/text/StringImpl.h
@@ -206,7 +206,13 @@ private:
     // and the actual size is determined when the instance is created. 
     // It will be zero unless using an "internal buffer", in which case m_data
     // will point to m_buffer and the length of m_buffer will be equal to m_length.
+#if COMPILER(GCC)
     const UChar m_buffer[];
+#else
+    // Non-GCC compilers may not accept the "[]" syntax. So we'll waste 2 bytes when
+    // allocating non-internal strings.
+    const UChar m_buffer[1];
+#endif
 };
 
 bool equal(StringImpl*, StringImpl*);

-- 
WebKit Debian packaging