bug: #7076 adds OUT and OPTIONAL to windows portability files (#7087)

protocolbuffers · Jan 13, 2020 · 2d9b178 · 2d9b178
1 parent c3ffdab
commit 2d9b178
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
@@ -388,6 +388,10 @@
 #undef IGNORE
 #pragma push_macro("IN")
 #undef IN
+#pragma push_macro("OUT")
+#undef OUT
+#pragma push_macro("OPTIONAL")
+#undef OPTIONAL
 #pragma push_macro("min")
 #undef min
 #pragma push_macro("max")

diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc
@@ -74,6 +74,8 @@
 #pragma pop_macro("GetMessage")
 #pragma pop_macro("IGNORE")
 #pragma pop_macro("IN")
+#pragma pop_macro("OUT")
+#pragma pop_macro("OPTIONAL")
 #pragma pop_macro("min")
 #pragma pop_macro("max")
 #endif