From b7f25d42d3bd1b8cd9d995111e654a4601fe2ac8 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Wed, 1 Mar 2017 01:45:54 +0000
Subject: Undef major/minor if they are defined as macro.

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

(limited to 'src/google/protobuf/compiler/command_line_interface.cc')

diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc
index 1914fc48..621d98c5 100644
--- a/src/google/protobuf/compiler/command_line_interface.cc
+++ b/src/google/protobuf/compiler/command_line_interface.cc
@@ -37,6 +37,12 @@
 
 #include <stdio.h>
 #include <sys/types.h>
+#ifdef major
+#undef major
+#endif
+#ifdef minor
+#undef minor
+#endif
 #include <sys/stat.h>
 #include <fcntl.h>
 #ifdef _MSC_VER
-- 
cgit v1.2.3