Don’t use the disappearing MSVC_PUSH_DISABLE_WARNING() macro

Bug: chromium:1053958
Change-Id: I4d3f6b5e1ea8f9433ce2db6da70f28cd4f539b7c
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2081257
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Mark Mentovai 2020-03-02 11:42:27 -05:00 committed by Commit Bot
parent 8bad6f140e
commit 11b8eb10d4

View File

@ -25,14 +25,15 @@
#include "util/misc/pdb_structures.h"
#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:
// disable it with other silly warnings in the build files. See:
// https://connect.microsoft.com/VisualStudio/feedback/details/1114440
MSVC_PUSH_DISABLE_WARNING(4200)
#pragma warning(push)
#pragma warning(disable: 4200)
#if defined(COMPILER_MSVC)
#define PACKED
#pragma pack(push, 1)
#else
@ -498,11 +499,10 @@ struct ALIGNAS(4) PACKED MinidumpCrashpadInfo {
#if defined(COMPILER_MSVC)
#pragma pack(pop)
#pragma warning(pop) // C4200
#endif // COMPILER_MSVC
#undef PACKED
MSVC_POP_WARNING() // C4200
} // namespace crashpad
#endif // CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_