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

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

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