From d2ba32308e3bb609edb43f02310949c6266c7f2e Mon Sep 17 00:00:00 2001 From: Egor Pugin Date: Mon, 3 Feb 2020 02:52:21 +0300 Subject: [PATCH] bug: #7076 adds ERROR to windows portability files --- src/google/protobuf/port_def.inc | 2 ++ src/google/protobuf/port_undef.inc | 1 + 2 files changed, 3 insertions(+) diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 375f919d7057..f88ff621d35f 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") diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc index 80822b470a9a..a2c4b7091246 100644 --- a/src/google/protobuf/port_undef.inc +++ b/src/google/protobuf/port_undef.inc @@ -71,6 +71,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")