Fix issue 3046: compilation on alpine 3.5

c3093d3e · Chris Nix · a6189acd · c3093d3e
Commit c3093d3e authored May 04, 2017 by Chris Nix
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

mock_code_generator.cc src/google/protobuf/compiler/mock_code_generator.cc +7 -0

No files found.
--- 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 {