Skip to content

P
protobuf
Commit 2d9b1788 authored by Scott Hart's avatar Scott Hart Committed by Rafi Kamal
Browse files
Options

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

parent c3ffdabe
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
src/google/protobuf/port_def.inc
View file @ 2d9b1788
...@@ -388,6 +388,10 @@ ...@@ -388,6 +388,10 @@
#undef IGNORE #undef IGNORE
#pragma push_macro("IN") #pragma push_macro("IN")
#undef IN #undef IN
#pragma push_macro("OUT")
#undef OUT
#pragma push_macro("OPTIONAL")
#undef OPTIONAL
#pragma push_macro("min") #pragma push_macro("min")
#undef min #undef min
#pragma push_macro("max") #pragma push_macro("max")
......
src/google/protobuf/port_undef.inc
View file @ 2d9b1788
...@@ -74,6 +74,8 @@ ...@@ -74,6 +74,8 @@
#pragma pop_macro("GetMessage") #pragma pop_macro("GetMessage")
#pragma pop_macro("IGNORE") #pragma pop_macro("IGNORE")
#pragma pop_macro("IN") #pragma pop_macro("IN")
#pragma pop_macro("OUT")
#pragma pop_macro("OPTIONAL")
#pragma pop_macro("min") #pragma pop_macro("min")
#pragma pop_macro("max") #pragma pop_macro("max")
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment