diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-23 09:28:44 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-23 09:28:44 +0200 |
| commit | 815f1ed417bd26fbe2abbdf20ac5d3423b30796c (patch) | |
| tree | 923c9a9e2834ccab60f5caecfb8f0ac410c1dd9e /Source/JavaScriptCore/runtime/JSGlobalData.h | |
| parent | b4ad5d9d2b96baacd0180ead50de5195ca78af2d (diff) | |
| download | qtwebkit-815f1ed417bd26fbe2abbdf20ac5d3423b30796c.tar.gz | |
Imported WebKit commit e65cbc5b6ac32627c797e7fc7f46eb7794410c92 (http://svn.webkit.org/repository/webkit/trunk@123308)
New snapshot with better configure tests
Diffstat (limited to 'Source/JavaScriptCore/runtime/JSGlobalData.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/JSGlobalData.h | 7 |
1 files changed, 7 insertions, 0 deletions
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> { |