From 815f1ed417bd26fbe2abbdf20ac5d3423b30796c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 23 Jul 2012 09:28:44 +0200
Subject: Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92
 (http://svn.webkit.org/repository/webkit/trunk@123308)

New snapshot with better configure tests
---
 Source/JavaScriptCore/runtime/JSGlobalData.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'Source/JavaScriptCore/runtime/JSGlobalData.h')

diff --git a/Source/JavaScriptCore/runtime/JSGlobalData.h b/Source/JavaScriptCore/runtime/JSGlobalData.h
index 90925778b..59a672f67 100644
--- a/Source/JavaScriptCore/runtime/JSGlobalData.h
+++ b/Source/JavaScriptCore/runtime/JSGlobalData.h
@@ -129,6 +129,10 @@ namespace JSC {
 #if ENABLE(DFG_JIT)
     class ConservativeRoots;
 
+#if COMPILER(MSVC)
+#pragma warning(push)
+#pragma warning(disable: 4200) // Disable "zero-sized array in struct/union" warning
+#endif
     struct ScratchBuffer {
         ScratchBuffer()
             : m_activeLength(0)
@@ -151,6 +155,9 @@ namespace JSC {
         size_t m_activeLength;
         void* m_buffer[0];
     };
+#if COMPILER(MSVC)
+#pragma warning(pop)
+#endif
 #endif
 
     class JSGlobalData : public ThreadSafeRefCounted<JSGlobalData> {
-- 
cgit v1.2.1