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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1457ed5bccbc28581c7594f448965a6add4079f9
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 3 13:57:09 2010 +0000

    2010-09-03  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            Fix warning in wtf/ByteArray.h
            https://bugs.webkit.org/show_bug.cgi?id=44672
    
            * wtf/ByteArray.h: Use maximal sized array for MSVC and unsized array for other compilers.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66729 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7cbf7f7..9ac7ca9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-03  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Fix warning in wtf/ByteArray.h
+        https://bugs.webkit.org/show_bug.cgi?id=44672
+
+        * wtf/ByteArray.h: Use maximal sized array for MSVC and unsized array for other compilers.
+
 2010-09-02  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/JavaScriptCore/wtf/ByteArray.h b/JavaScriptCore/wtf/ByteArray.h
index f5f5ded..f4d34a4 100644
--- a/JavaScriptCore/wtf/ByteArray.h
+++ b/JavaScriptCore/wtf/ByteArray.h
@@ -26,7 +26,9 @@
 #ifndef ByteArray_h
 #define ByteArray_h
 
+#include <limits.h>
 #include <wtf/PassRefPtr.h>
+#include <wtf/Platform.h>
 #include <wtf/RefCounted.h>
 
 namespace WTF {
@@ -86,7 +88,14 @@ namespace WTF {
         {
         }
         size_t m_size;
-        unsigned char m_data[sizeof(size_t)];
+// MSVC can't handle correctly unsized array.
+// warning C4200: nonstandard extension used : zero-sized array in struct/union
+// Cannot generate copy-ctor or copy-assignment operator when UDT contains a zero-sized array
+#if COMPILER(MSVC)
+        unsigned char m_data[INT_MAX];
+#else
+        unsigned char m_data[];
+#endif
     };
 }
 

-- 
WebKit Debian packaging