Merge pull request #3055 from chrisn-arm/3.3.x

Fix compilation on alpine 3.5
2017-05-04 11:08:53 -07:00 · 2017-05-04 11:08:53 -07:00 · dd0a23325d
commit dd0a23325d
parent a6189acd18 c3093d3ee5
1 changed files with 7 additions and 0 deletions
--- a/src/google/protobuf/compiler/mock_code_generator.cc
+++ b/src/google/protobuf/compiler/mock_code_generator.cc
@ -55,6 +55,13 @@
 #include <google/protobuf/stubs/substitute.h>
 #include <gtest/gtest.h>

+#ifdef major		
+#undef major		
+#endif		
+#ifdef minor		
+#undef minor		
+#endif		
+
 namespace google {
 namespace protobuf {
 namespace compiler {