diff options
author | Jisi Liu <liujisi@google.com> | 2017-11-13 10:47:29 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-13 10:47:29 -0800 |
commit | 2761122b810fe8861004ae785cc3ab39f384d342 (patch) | |
tree | 128a98651248f01f7b3909634669517ae98db927 /src/google/protobuf/message_unittest.cc | |
parent | 188f18044feb1ca82ecc922f3e59e37078473ddf (diff) | |
parent | 9c197b7ecba6019b7c81c673cf100b2fad4033ad (diff) | |
download | protobuf-3.5.0.tar.gz protobuf-3.5.0.tar.bz2 protobuf-3.5.0.zip |
Merge pull request #3868 from pherl/3.5.xv3.5.0
Support win32 long path for cross compiled build
Diffstat (limited to 'src/google/protobuf/message_unittest.cc')
-rw-r--r-- | src/google/protobuf/message_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/message_unittest.cc b/src/google/protobuf/message_unittest.cc index d328f9dd..a27036e7 100644 --- a/src/google/protobuf/message_unittest.cc +++ b/src/google/protobuf/message_unittest.cc @@ -63,7 +63,7 @@ namespace google { namespace protobuf { -#if defined(_MSC_VER) +#if defined(_WIN32) // DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import // them like we do below. using google::protobuf::internal::win32::close; |