Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Jan 13, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/google/protobuf/port_def.inc
View file
Open in desktop
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
View file
Open in desktop
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