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

2d9b1788 · Scott Hart · Rafi Kamal · c3ffdabe · 2d9b1788 · 2d9b1788
Commit 2d9b1788 authored Jan 13, 2020 by Scott Hart Committed by Rafi Kamal Jan 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

port_def.inc src/google/protobuf/port_def.inc +4 -0

port_undef.inc src/google/protobuf/port_undef.inc +2 -0

No files found.
--- 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")

--- 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