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/test/native | |
| 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/test/native')
| -rw-r--r-- | src/test/native/windows/file_test.cc | 4 | ||||
| -rw-r--r-- | src/test/native/windows/util_test.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/native/windows/file_test.cc b/src/test/native/windows/file_test.cc index 56b6fa2e55..9c4e23388c 100644 --- a/src/test/native/windows/file_test.cc +++ b/src/test/native/windows/file_test.cc @@ -23,9 +23,9 @@ #include "src/main/native/windows/file.h" #include "src/test/cpp/util/windows_test_util.h" -#if !defined(COMPILER_MSVC) && !defined(__CYGWIN__) +#if !defined(_WIN32) && !defined(__CYGWIN__) #error("This test should only be run on Windows") -#endif // !defined(COMPILER_MSVC) && !defined(__CYGWIN__) +#endif // !defined(_WIN32) && !defined(__CYGWIN__) namespace bazel { namespace windows { diff --git a/src/test/native/windows/util_test.cc b/src/test/native/windows/util_test.cc index 2a131e77b1..295729f178 100644 --- a/src/test/native/windows/util_test.cc +++ b/src/test/native/windows/util_test.cc @@ -23,9 +23,9 @@ #include "gtest/gtest.h" #include "src/main/native/windows/util.h" -#if !defined(COMPILER_MSVC) && !defined(__CYGWIN__) +#if !defined(_WIN32) && !defined(__CYGWIN__) #error("This test should only be run on Windows") -#endif // !defined(COMPILER_MSVC) && !defined(__CYGWIN__) +#endif // !defined(_WIN32) && !defined(__CYGWIN__) namespace bazel { namespace windows { |