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/main/cpp/blaze_util_platform.h b/src/main/cpp/blaze_util_platform.h
index f08aa56..078e271 100644
--- a/src/main/cpp/blaze_util_platform.h
+++ b/src/main/cpp/blaze_util_platform.h
@@ -128,7 +128,7 @@
bool SymlinkDirectories(const std::string& target, const std::string& link);
struct BlazeLock {
-#if defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
/* HANDLE */ void* handle;
#else
int lockfd;
diff --git a/src/main/cpp/option_processor.cc b/src/main/cpp/option_processor.cc
index c2f480f..582833a 100644
--- a/src/main/cpp/option_processor.cc
+++ b/src/main/cpp/option_processor.cc
@@ -387,7 +387,7 @@
}
static bool IsValidEnvName(const char* p) {
-#if defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
for (; *p && *p != '='; ++p) {
if (!((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z') ||
(*p >= '0' && *p <= '9') || *p == '_')) {
@@ -398,7 +398,7 @@
return true;
}
-#if defined(COMPILER_MSVC)
+#if defined(_WIN32)
static void PreprocessEnvString(string* env_str) {
static constexpr const char* vars_to_uppercase[] = {"PATH", "SYSTEMROOT",
"TEMP", "TEMPDIR", "TMP"};
@@ -415,7 +415,7 @@
}
}
-#elif defined(__CYGWIN__) // not defined(COMPILER_MSVC)
+#elif defined(__CYGWIN__) // not defined(_WIN32)
static void PreprocessEnvString(string* env_str) {
int pos = env_str->find_first_of('=');
@@ -435,7 +435,7 @@
static void PreprocessEnvString(const string* env_str) {
// do nothing.
}
-#endif // defined(COMPILER_MSVC)
+#endif // defined(_WIN32)
static std::vector<std::string> GetProcessedEnv() {
std::vector<std::string> processed_env;
diff --git a/src/main/cpp/startup_options.cc b/src/main/cpp/startup_options.cc
index 67e0d55a..8f028f5 100644
--- a/src/main/cpp/startup_options.cc
+++ b/src/main/cpp/startup_options.cc
@@ -108,13 +108,13 @@
<< "'.";
}
-#if defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
string windows_unix_root = WindowsUnixRoot(blaze::GetEnv("BAZEL_SH"));
if (!windows_unix_root.empty()) {
host_jvm_args.push_back(string("-Dbazel.windows_unix_root=") +
windows_unix_root);
}
-#endif // defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#endif // defined(_WIN32) || defined(__CYGWIN__)
const string product_name_lower = GetLowercaseProductName();
output_user_root = blaze_util::JoinPath(
@@ -528,7 +528,7 @@
return blaze_exit_code::SUCCESS;
}
-#if defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
// Extract the Windows path of "/" from $BAZEL_SH.
// $BAZEL_SH usually has the form `<prefix>/usr/bin/bash.exe` or
// `<prefix>/bin/bash.exe`, and this method returns that `<prefix>` part.
@@ -554,6 +554,6 @@
return split.first;
}
}
-#endif // defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#endif // defined(_WIN32) || defined(__CYGWIN__)
} // namespace blaze
diff --git a/src/main/cpp/startup_options.h b/src/main/cpp/startup_options.h
index f6ffd25..84079f1 100644
--- a/src/main/cpp/startup_options.h
+++ b/src/main/cpp/startup_options.h
@@ -312,7 +312,7 @@
// Contains the collection of startup flags that Bazel accepts.
std::set<std::unique_ptr<StartupFlag>> valid_startup_flags;
-#if defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
static std::string WindowsUnixRoot(const std::string &bazel_sh);
#endif
};
diff --git a/src/main/cpp/util/file_platform.h b/src/main/cpp/util/file_platform.h
index ac4fc3a..861ca9e9 100644
--- a/src/main/cpp/util/file_platform.h
+++ b/src/main/cpp/util/file_platform.h
@@ -50,7 +50,7 @@
// Creates a platform-specific implementation of `IFileMtime`.
IFileMtime *CreateFileMtime();
-#if defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
// We cannot include <windows.h> because it #defines many symbols that conflict
// with our function names, e.g. GetUserName, SendMessage.
// Instead of typedef'ing HANDLE, let's use the actual type, void*. If that ever
@@ -58,9 +58,9 @@
// (very unlikely, given how fundamental this type is in Windows), then we'd get
// a compilation error.
typedef /* HANDLE */ void *file_handle_type;
-#else // !(defined(COMPILER_MSVC) || defined(__CYGWIN__))
+#else // !(defined(_WIN32) || defined(__CYGWIN__))
typedef int file_handle_type;
-#endif // defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#endif // defined(_WIN32) || defined(__CYGWIN__)
// Result of a `ReadFromHandle` operation.
//
@@ -199,9 +199,9 @@
void ForEachDirectoryEntry(const std::string &path,
DirectoryEntryConsumer *consume);
-#if defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#if defined(_WIN32) || defined(__CYGWIN__)
std::wstring GetCwdW();
-#endif // defined(COMPILER_MSVC) || defined(__CYGWIN__)
+#endif // defined(_WIN32) || defined(__CYGWIN__)
} // namespace blaze_util
diff --git a/src/main/cpp/util/md5.h b/src/main/cpp/util/md5.h
index d153a44..3bf1acf 100644
--- a/src/main/cpp/util/md5.h
+++ b/src/main/cpp/util/md5.h
@@ -20,9 +20,9 @@
#include <string>
-#if defined(COMPILER_MSVC) && !defined(__alignof__)
+#if defined(_MSC_VER) && !defined(__alignof__)
#define __alignof__ __alignof
-#endif // COMPILER_MSVC && !__alignof__
+#endif // _MSC_VER && !__alignof__
namespace blaze_util {
diff --git a/src/main/cpp/util/path_platform.h b/src/main/cpp/util/path_platform.h
index 1f14bd6..9653a67 100644
--- a/src/main/cpp/util/path_platform.h
+++ b/src/main/cpp/util/path_platform.h
@@ -59,7 +59,7 @@
// 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 @@
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_
diff --git a/src/main/cpp/util/port.h b/src/main/cpp/util/port.h
index ea5f560..fa5a600 100644
--- a/src/main/cpp/util/port.h
+++ b/src/main/cpp/util/port.h
@@ -135,12 +135,12 @@
#define arraysize(array) (sizeof(ArraySizeHelper(array)))
-#ifdef COMPILER_MSVC
+#ifdef _WIN32
// TODO(laszlocsomor) 2016-11-28: move pid_t usage out of global_variables.h and
// whereever else it appears. Find some way to not have to declare a pid_t here,
// either by making PID handling platform-independent or some other idea; remove
// the following typedef afterwards.
typedef int pid_t;
-#endif // COMPILER_MSVC
+#endif // _WIN32
#endif // BAZEL_SRC_MAIN_CPP_UTIL_PORT_H_
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 {
diff --git a/src/test/native/windows/file_test.cc b/src/test/native/windows/file_test.cc
index 56b6fa2..9c4e233 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 2a131e7..295729f 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 {
diff --git a/src/test/py/bazel/cc_import_test.py b/src/test/py/bazel/cc_import_test.py
index 1563957..99ab086 100644
--- a/src/test/py/bazel/cc_import_test.py
+++ b/src/test/py/bazel/cc_import_test.py
@@ -79,7 +79,7 @@
self.ScratchFile('lib/a.cc', [
'#include <stdio.h>',
'',
- '#ifdef COMPILER_MSVC',
+ '#ifdef _WIN32',
' #define DLLEXPORT __declspec(dllexport)',
'#else',
' #define DLLEXPORT',
diff --git a/src/tools/singlejar/diag.h b/src/tools/singlejar/diag.h
index cae255f..6ca452a 100644
--- a/src/tools/singlejar/diag.h
+++ b/src/tools/singlejar/diag.h
@@ -27,7 +27,7 @@
#define diag_warn(...) warn(__VA_ARGS__)
#define diag_warnx(...) warnx(__VA_ARGS__)
-#elif defined(COMPILER_MSVC)
+#elif defined(_WIN32)
#include <stdio.h>
#include <string.h>
diff --git a/src/tools/singlejar/mapped_file.h b/src/tools/singlejar/mapped_file.h
index 610ad46..f4ada45 100644
--- a/src/tools/singlejar/mapped_file.h
+++ b/src/tools/singlejar/mapped_file.h
@@ -28,11 +28,11 @@
*/
class MappedFile {
public:
-#ifdef COMPILER_MSVC
+#ifdef _WIN32
typedef /* HANDLE = void* */ void *FileHandleType;
-#else // not COMPILER_MSVC
+#else // not _WIN32
typedef int FileHandleType;
-#endif // COMPILER_MSVC
+#endif // _WIN32
MappedFile();
@@ -64,10 +64,10 @@
FileHandleType fd_;
};
-#ifdef COMPILER_MSVC
+#ifdef _WIN32
#include "src/tools/singlejar/mapped_file_windows.inc"
-#else // not COMPILER_MSVC
+#else // not _WIN32
#include "src/tools/singlejar/mapped_file_posix.inc"
-#endif // COMPILER_MSVC
+#endif // _WIN32
#endif // BAZEL_SRC_TOOLS_SINGLEJAR_MAPPED_FILE_H_
diff --git a/src/tools/singlejar/mapped_file_windows.inc b/src/tools/singlejar/mapped_file_windows.inc
index 5875149..366103f 100644
--- a/src/tools/singlejar/mapped_file_windows.inc
+++ b/src/tools/singlejar/mapped_file_windows.inc
@@ -15,7 +15,7 @@
#ifndef BAZEL_SRC_TOOLS_SINGLEJAR_MAPPED_FILE_WINDOWS_H_
#define BAZEL_SRC_TOOLS_SINGLEJAR_MAPPED_FILE_WINDOWS_H_ 1
-#if !defined(COMPILER_MSVC) || !defined(_WIN64)
+#if !defined(_WIN64)
#error This code is for 64 bit Windows.
#endif
diff --git a/src/tools/singlejar/zip_headers.h b/src/tools/singlejar/zip_headers.h
index 6d10cc2..3677a20 100644
--- a/src/tools/singlejar/zip_headers.h
+++ b/src/tools/singlejar/zip_headers.h
@@ -29,7 +29,7 @@
#include <endian.h>
#elif defined(__FreeBSD__)
#include <sys/endian.h>
-#elif defined(__APPLE__) || defined(COMPILER_MSVC)
+#elif defined(__APPLE__) || defined(_WIN32)
// Hopefully OSX and Windows will keep running solely on little endian CPUs, so:
#define le16toh(x) (x)
#define le32toh(x) (x)
@@ -44,7 +44,7 @@
#include <string>
#include <type_traits>
-#ifdef COMPILER_MSVC
+#ifdef _MSC_VER
#pragma pack(push, 1)
#define attr_packed
#else
@@ -653,7 +653,7 @@
} attr_packed;
static_assert(56 == sizeof(ECD64), "ECD64 class fields layout is incorrect.");
-#ifdef COMPILER_MSVC
+#ifdef _MSC_VER
#pragma pack(pop)
#endif
