organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Undef major/minor if they are defined as macro.

Browse source
This commit is contained in:
Feng Xiao 2017-03-01 01:45:54 +00:00
parent 5274d6ee31
commit b7f25d42d3
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/google/protobuf/compiler/command_line_interface.cc
View file

@ -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

9
src/google/protobuf/compiler/mock_code_generator.cc
View file

@ -40,7 +40,6 @@
#endif
#include <vector>
#include <google/protobuf/compiler/plugin.pb.h>
#include <google/protobuf/stubs/logging.h>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/testing/file.h>
@ -54,6 +53,14 @@
#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 {