Merge pull request #6 from protocolbuffers/master

bug: protocolbuffers#7076 adds ERROR to windows portability files
sthagen · Feb 23, 2020 · 87fa3d5 · 87fa3d5
2 parents 88fe5f3 + c798ba1
commit 87fa3d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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")

diff --git 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")