commit c798ba18a99bc14a2e8712724fbc773e8127505f
author Egor Pugin <egor.pugin@gmail.com> Mon Feb 03 02:52:21 2020 +0300
committer Adam Cozzette <acozzette@google.com> Fri Feb 21 14:49:18 2020 -0800
tree ffebe82873a3a23ab1c4532d6bd5b9d33055b3aa
parent b96241b1b716781f5bc4dc25e1ebb0003dfaba6a

bug: #7076 adds ERROR to windows portability files

src/google/protobuf/port_def.inc

diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index c838c22..d09877b 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -382,6 +382,8 @@
 // Windows declares several inconvenient macro names.  We #undef them and then
 // restore them in port_undef.inc.
 #ifdef _MSC_VER
+#pragma push_macro("ERROR")
+#undef ERROR
 #pragma push_macro("GetMessage")
 #undef GetMessage
 #pragma push_macro("IGNORE")

src/google/protobuf/port_undef.inc

diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc
index 3b80e52..2cc56f3 100644
--- a/src/google/protobuf/port_undef.inc
+++ b/src/google/protobuf/port_undef.inc
@@ -72,6 +72,7 @@
 
 // Restore macro that may have been #undef'd in port_def.inc.
 #ifdef _MSC_VER
+#pragma pop_macro("ERROR")
 #pragma pop_macro("GetMessage")
 #pragma pop_macro("IGNORE")
 #pragma pop_macro("IN")