commit f6371bd920738b8426aaf8da4904579eca1a2406
author Mark Mentovai <mark@chromium.org> Mon Mar 02 11:42:27 2020 -0500
committer Copybara-Service <copybara-worker@google.com> Tue Jan 19 06:47:52 2021 -0800
tree 57664b3c512b32aea7ea9a4a532e7a2aabf27393
parent c3d7ae13adec64c742e739ed44c2b2b351f2efa5

Don’t use the disappearing MSVC_PUSH_DISABLE_WARNING() macro

Bug: chromium:1053958
Change-Id: Id8c1cb320bdf343526fd3b7975cc5648cecd925c
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>
GitOrigin-RevId: 11b8eb10d4ad6ed50ee43d3bb50d13967d638dfa

minidump/minidump_extensions.h

diff --git a/minidump/minidump_extensions.h b/minidump/minidump_extensions.h
index 6715744..9332f96 100644
--- a/minidump/minidump_extensions.h
+++ b/minidump/minidump_extensions.h
@@ -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 @@
 
 #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_