diff options
| author |  Loo Rong Jie <loorongjie@gmail.com> | 2018-06-11 02:04:52 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-11 02:06:38 -0700 |
| commit | 4022bac855a790b3a42fcb44c06f62dbbe078c5a (patch) | |
| tree | c4f4a7b5fb602020c724b23e3ffcca3804e1207f /src/main/cpp/util/path_platform.h | |
| parent | 2c89206a407d8cae0945abe7eb179ee6bb77d9de (diff) | |
Remove usage of COMPILER_MSVC in Bazel and ijar
Convert most `COMPILER_MSVC` to `_WIN32` (as they apply to Windows platform, not MSVC compiler). Only `src/tools/singlejar/zip_headers.h` and `src/main/cpp/util/md5.h` actually need `_MSC_VER`.
`COMPILER_MSVC` in `third_party/protobuf` are not removed. They can be fixed by updating dependency to newer version.
/cc @meteorcloudy
Closes #5350.
Change-Id: Ibc131abfaf34a0cb2bd338549983ea9d28eaabfe
PiperOrigin-RevId: 200019793
Diffstat (limited to 'src/main/cpp/util/path_platform.h')
| -rw-r--r-- | src/main/cpp/util/path_platform.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/cpp/util/path_platform.h b/src/main/cpp/util/path_platform.h index 1f14bd6ab0..9653a676bb 100644 --- a/src/main/cpp/util/path_platform.h +++ b/src/main/cpp/util/path_platform.h @@ -59,7 +59,7 @@ std::string MakeAbsolute(const std::string &path); // are included by an import statement. The downside to this gain in clarity // is that this would add more complexity to the implementation file(s)? of // path.h, which would have to have the platform-specific implementations. -#if defined(COMPILER_MSVC) || defined(__CYGWIN__) +#if defined(_WIN32) || defined(__CYGWIN__) const wchar_t *RemoveUncPrefixMaybe(const wchar_t *ptr); void AddUncPrefixMaybe(std::wstring *path); @@ -122,7 +122,7 @@ bool IsPathSeparator(char_type ch); template <typename char_type> bool HasDriveSpecifierPrefix(const char_type *ch); -#endif // defined(COMPILER_MSVC) || defined(__CYGWIN__) +#endif // defined(_WIN32) || defined(__CYGWIN__) } // namespace blaze_util #endif // BAZEL_SRC_MAIN_CPP_UTIL_PATH_PLATFORM_H_ |