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
diff --git a/src/test/cpp/option_processor_test.cc b/src/test/cpp/option_processor_test.cc
index 10e55cf..d963fbb 100644
--- a/src/test/cpp/option_processor_test.cc
+++ b/src/test/cpp/option_processor_test.cc
@@ -319,7 +319,7 @@
ASSERT_EQ(expected, internal::DedupeBlazercPaths(input));
}
-#if !defined(COMPILER_MSVC) && !defined(__CYGWIN__)
+#if !defined(_WIN32) && !defined(__CYGWIN__)
static bool Symlink(const std::string& old_path, const std::string& new_path) {
return symlink(old_path.c_str(), new_path.c_str()) == 0;
}
@@ -334,6 +334,6 @@
std::vector<std::string> expected = {foo_path};
ASSERT_EQ(expected, internal::DedupeBlazercPaths(input));
}
-#endif // !defined(COMPILER_MSVC) && !defined(__CYGWIN__)
+#endif // !defined(_WIN32) && !defined(__CYGWIN__)
} // namespace blaze
diff --git a/src/test/cpp/rc_file_test.cc b/src/test/cpp/rc_file_test.cc
index a534778..f10287d 100644
--- a/src/test/cpp/rc_file_test.cc
+++ b/src/test/cpp/rc_file_test.cc
@@ -30,7 +30,7 @@
using ::testing::HasSubstr;
using ::testing::MatchesRegex;
-#if defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
constexpr const char* kNullDevice = "nul";
#else // Assume POSIX if not Windows.
constexpr const char* kNullDevice = "/dev/null";
diff --git a/src/test/cpp/util/file_windows_test.cc b/src/test/cpp/util/file_windows_test.cc
index 1844736..7bef9cf 100644
--- a/src/test/cpp/util/file_windows_test.cc
+++ b/src/test/cpp/util/file_windows_test.cc
@@ -30,9 +30,9 @@
#include "src/test/cpp/util/test_util.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 blaze_util {
diff --git a/src/test/cpp/util/path_windows_test.cc b/src/test/cpp/util/path_windows_test.cc
index 003fc9a..1587560 100644
--- a/src/test/cpp/util/path_windows_test.cc
+++ b/src/test/cpp/util/path_windows_test.cc
@@ -29,9 +29,9 @@
#include "src/test/cpp/util/test_util.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 blaze_util {
diff --git a/src/test/cpp/util/test_util.h b/src/test/cpp/util/test_util.h
index bc777ff..d82a677 100644
--- a/src/test/cpp/util/test_util.h
+++ b/src/test/cpp/util/test_util.h
@@ -16,9 +16,9 @@
#include <stdio.h>
-#if !defined(COMPILER_MSVC) && !defined(__CYGWIN__)
+#if !defined(_WIN32) && !defined(__CYGWIN__)
#include <unistd.h>
-#endif // not COMPILER_MSVC and not __CYGWIN__
+#endif // not _WIN32 and not __CYGWIN__
namespace blaze_util {
@@ -51,9 +51,9 @@
handle_type fd;
};
-#if !defined(COMPILER_MSVC) && !defined(__CYGWIN__)
+#if !defined(_WIN32) && !defined(__CYGWIN__)
typedef struct AutoFileHandle<int, -1, close> AutoFd;
-#endif // not COMPILER_MSVC and not __CYGWIN__
+#endif // not _WIN32 and not __CYGWIN__
typedef struct AutoFileHandle<FILE*, nullptr, fclose> AutoFileStream;
diff --git a/src/test/cpp/util/windows_test_util.cc b/src/test/cpp/util/windows_test_util.cc
index 47bdc31..ebc2ced 100644
--- a/src/test/cpp/util/windows_test_util.cc
+++ b/src/test/cpp/util/windows_test_util.cc
@@ -19,9 +19,9 @@
#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 blaze_util {
diff --git a/src/test/cpp/util/windows_test_util_test.cc b/src/test/cpp/util/windows_test_util_test.cc
index d777a91..7ee97f1 100644
--- a/src/test/cpp/util/windows_test_util_test.cc
+++ b/src/test/cpp/util/windows_test_util_test.cc
@@ -18,9 +18,9 @@
#include "googletest/include/gtest/gtest.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 blaze_util {
