From d36c0c538a545fac5d9db6ba65c525246d4efa95 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Wed, 29 Mar 2017 14:32:48 -0700
Subject: Down-integrate from google3.

---
 src/google/protobuf/compiler/mock_code_generator.cc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

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

diff --git a/src/google/protobuf/compiler/mock_code_generator.cc b/src/google/protobuf/compiler/mock_code_generator.cc
index a4b522ce..0ddb99e5 100644
--- a/src/google/protobuf/compiler/mock_code_generator.cc
+++ b/src/google/protobuf/compiler/mock_code_generator.cc
@@ -40,27 +40,21 @@
 #endif
 #include <vector>
 
+#include <google/protobuf/stubs/strutil.h>
+
 #include <google/protobuf/stubs/logging.h>
 #include <google/protobuf/stubs/common.h>
 #include <google/protobuf/testing/file.h>
 #include <google/protobuf/testing/file.h>
 #include <google/protobuf/testing/file.h>
+#include <google/protobuf/compiler/plugin.pb.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/io/zero_copy_stream.h>
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/strutil.h>
 #include <google/protobuf/stubs/substitute.h>
 #include <gtest/gtest.h>
 
-#ifdef major
-#undef major
-#endif
-#ifdef minor
-#undef minor
-#endif
-#include <google/protobuf/compiler/plugin.pb.h>
-
 namespace google {
 namespace protobuf {
 namespace compiler {
-- 
cgit v1.2.3