diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:19 -0800 |
| commit | 0ba8eea655a5e40d19ab95c773192b5d908c5a61 (patch) | |
| tree | 4c2c97ade1ab197d361c146bacae5adde55986bf /src/google/protobuf/stubs/io_win32.cc | |
| parent | 92a7e778e7394386f413cec28d67a07630f784b1 (diff) | |
| parent | a711e3d5b4ee1dd7f9d21197dca8432a5819a64e (diff) | |
Merge branch 'master' into down-integrate
Diffstat (limited to 'src/google/protobuf/stubs/io_win32.cc')
| -rw-r--r-- | src/google/protobuf/stubs/io_win32.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/io_win32.cc b/src/google/protobuf/stubs/io_win32.cc index 7e1cf785..fa2cb8b1 100644 --- a/src/google/protobuf/stubs/io_win32.cc +++ b/src/google/protobuf/stubs/io_win32.cc @@ -39,7 +39,7 @@ // // This file is only used on Windows, it's empty on other platforms. -#if defined(_MSC_VER) +#if defined(_WIN32) // Comment this out to fall back to using the ANSI versions (open, mkdir, ...) // instead of the Unicode ones (_wopen, _wmkdir, ...). Doing so can be useful to @@ -358,5 +358,5 @@ wstring testonly_path_to_winpath(const string& path) { } // namespace protobuf } // namespace google -#endif // defined(_MSC_VER) +#endif // defined(_WIN32) |