Skip to content
Permalink
Browse files

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

  • Loading branch information
scotthart authored and rafi-kamal committed Jan 13, 2020
1 parent c3ffdab commit 2d9b1788e7a61688c79bf9361740b4fb744cb61f
Showing with 6 additions and 0 deletions.
  1. +4 −0 src/google/protobuf/port_def.inc
  2. +2 −0 src/google/protobuf/port_undef.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")
@@ -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

0 comments on commit 2d9b178

Please sign in to comment.
You can’t perform that action at this time.