Skip to content

Commit

Permalink
bug: #7076 adds OUT and OPTIONAL to windows portability files (#7088)
Browse files Browse the repository at this point in the history
  • Loading branch information
scotthart authored and rafi-kamal committed Jan 13, 2020
1 parent abc5062 commit 80eca4c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/google/protobuf/port_def.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 2 additions & 0 deletions src/google/protobuf/port_undef.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 80eca4c

Please sign in to comment.