diff options
| author |  Chris Nix <chris.nix@arm.com> | 2017-05-04 09:50:37 +0100 |
|---|---|---|
| committer | Chris Nix <chris.nix@arm.com> | 2017-05-04 09:50:37 +0100 |
| commit | c3093d3ee5f1d8e6264b3858d0ae44feddbf23c0 (patch) | |
| tree | a75e7c09fcd72cb1a0f6bfbb7e2248573c40a892 /src | |
| parent | a6189acd18b00611c1dc7042299ad75486f08a1a (diff) | |
Fix issue 3046: compilation on alpine 3.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/compiler/mock_code_generator.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/mock_code_generator.cc b/src/google/protobuf/compiler/mock_code_generator.cc index 0ddb99e5..8b7a6146 100644 --- 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 { |