Index: test/cctest/cctest.cc |
diff --git a/test/cctest/cctest.cc b/test/cctest/cctest.cc |
index d6b1308086e0578e92bc73e6fdc75ab0ce1ec6a8..170aa5a8a5fdc59a9e03d15f5fd264697c4774ba 100644 |
--- a/test/cctest/cctest.cc |
+++ b/test/cctest/cctest.cc |
@@ -34,12 +34,12 @@ |
#include "test/cctest/profiler-extension.h" |
#include "test/cctest/trace-extension.h" |
-#if (defined(_WIN32) || defined(_WIN64)) |
+#if V8_OS_WIN |
#include <windows.h> // NOLINT |
-#if defined(_MSC_VER) |
+#if V8_CC_MSVC |
#include <crtdbg.h> |
-#endif // defined(_MSC_VER) |
-#endif // defined(_WIN32) || defined(_WIN64) |
+#endif |
+#endif |
enum InitializationState {kUnset, kUnintialized, kInitialized}; |
static InitializationState initialization_state_ = kUnset; |
@@ -145,12 +145,12 @@ static void SuggestTestHarness(int tests) { |
int main(int argc, char* argv[]) { |
-#if (defined(_WIN32) || defined(_WIN64)) |
+#if V8_OS_WIN |
UINT new_flags = |
SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX; |
UINT existing_flags = SetErrorMode(new_flags); |
SetErrorMode(existing_flags | new_flags); |
-#if defined(_MSC_VER) |
+#if V8_CC_MSVC |
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); |
_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); |
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); |
@@ -158,8 +158,8 @@ int main(int argc, char* argv[]) { |
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG | _CRTDBG_MODE_FILE); |
_CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); |
_set_error_mode(_OUT_TO_STDERR); |
-#endif // _MSC_VER |
-#endif // defined(_WIN32) || defined(_WIN64) |
+#endif // V8_CC_MSVC |
+#endif // V8_OS_WIN |
v8::V8::InitializeICU(); |
v8::Platform* platform = v8::platform::CreateDefaultPlatform(); |