From c3093d3ee5f1d8e6264b3858d0ae44feddbf23c0 Mon Sep 17 00:00:00 2001
From: Chris Nix <chris.nix@arm.com>
Date: Thu, 4 May 2017 09:50:37 +0100
Subject: Fix issue 3046: compilation on alpine 3.5

---
 src/google/protobuf/compiler/mock_code_generator.cc | 7 +++++++
 1 file changed, 7 insertions(+)

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 {
-- 
cgit v1.2.3