| Index: minidump/minidump_extensions.h
|
| diff --git a/minidump/minidump_extensions.h b/minidump/minidump_extensions.h
|
| index 2ec3403ad68794942b0943729016071e50ce7312..8453f5538f5d9c9213420d52524d26f03f4ae1da 100644
|
| --- a/minidump/minidump_extensions.h
|
| +++ b/minidump/minidump_extensions.h
|
| @@ -25,6 +25,16 @@
|
| #include "util/misc/uuid.h"
|
|
|
| #if defined(COMPILER_MSVC)
|
| +// C4200 is "nonstandard extension used : zero-sized array in struct/union".
|
| +// We would like to globally disable this warning, but unfortunately, the
|
| +// compiler is buggy and only supports disabling it with a pragma, so we can't
|
| +// disable it with other silly warnings in build/common.gypi. See:
|
| +// https://connect.microsoft.com/VisualStudio/feedback/details/1114440
|
| +#pragma warning(push)
|
| +#pragma warning(disable: 4200)
|
| +#endif // COMPILER_MSVC
|
| +
|
| +#if defined(COMPILER_MSVC)
|
| #define PACKED
|
| #pragma pack(push, 1)
|
| #else
|
| @@ -460,6 +470,10 @@ struct ALIGNAS(4) PACKED MinidumpCrashpadInfo {
|
| #endif // COMPILER_MSVC
|
| #undef PACKED
|
|
|
| +#if defined(COMPILER_MSVC)
|
| +#pragma warning(pop) // C4200
|
| +#endif // COMPILER_MSVC
|
| +
|
| } // namespace crashpad
|
|
|
| #endif // CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_
|
|
|