Author: mstorsjo Date: Mon Sep 23 05:03:56 2019 New Revision: 372592 URL: http://llvm.org/viewvc/llvm-project?rev=372592&view=rev Log: [LLDB] Check for _WIN32 instead of _MSC_VER for code specific to windows in general
These ifdefs contain code that isn't specific to MSVC but useful for any windows target, like MinGW. Differential Revision: https://reviews.llvm.org/D67893 Modified: lldb/trunk/source/Core/IOHandler.cpp lldb/trunk/source/Host/common/UDPSocket.cpp lldb/trunk/source/Host/posix/ConnectionFileDescriptorPosix.cpp lldb/trunk/source/Utility/SelectHelper.cpp lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp Modified: lldb/trunk/source/Core/IOHandler.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/IOHandler.cpp?rev=372592&r1=372591&r2=372592&view=diff ============================================================================== --- lldb/trunk/source/Core/IOHandler.cpp (original) +++ lldb/trunk/source/Core/IOHandler.cpp Mon Sep 23 05:03:56 2019 @@ -579,7 +579,7 @@ void IOHandlerEditline::PrintAsync(Strea else #endif { -#ifdef _MSC_VER +#ifdef _WIN32 const char *prompt = GetPrompt(); if (prompt) { // Back up over previous prompt using Windows API @@ -594,7 +594,7 @@ void IOHandlerEditline::PrintAsync(Strea } #endif IOHandler::PrintAsync(stream, s, len); -#ifdef _MSC_VER +#ifdef _WIN32 if (prompt) IOHandler::PrintAsync(GetOutputStreamFile().get(), prompt, strlen(prompt)); Modified: lldb/trunk/source/Host/common/UDPSocket.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/UDPSocket.cpp?rev=372592&r1=372591&r2=372592&view=diff ============================================================================== --- lldb/trunk/source/Host/common/UDPSocket.cpp (original) +++ lldb/trunk/source/Host/common/UDPSocket.cpp Mon Sep 23 05:03:56 2019 @@ -80,7 +80,7 @@ Status UDPSocket::Connect(llvm::StringRe &service_info_list); if (err != 0) { error.SetErrorStringWithFormat( -#if defined(_MSC_VER) && defined(UNICODE) +#if defined(_WIN32) && defined(UNICODE) "getaddrinfo(%s, %s, &hints, &info) returned error %i (%S)", #else "getaddrinfo(%s, %s, &hints, &info) returned error %i (%s)", Modified: lldb/trunk/source/Host/posix/ConnectionFileDescriptorPosix.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/posix/ConnectionFileDescriptorPosix.cpp?rev=372592&r1=372591&r2=372592&view=diff ============================================================================== --- lldb/trunk/source/Host/posix/ConnectionFileDescriptorPosix.cpp (original) +++ lldb/trunk/source/Host/posix/ConnectionFileDescriptorPosix.cpp Mon Sep 23 05:03:56 2019 @@ -564,7 +564,7 @@ ConnectionFileDescriptor::BytesAvailable select_helper.SetTimeout(*timeout); select_helper.FDSetRead(handle); -#if defined(_MSC_VER) +#if defined(_WIN32) // select() won't accept pipes on Windows. The entire Windows codepath // needs to be converted over to using WaitForMultipleObjects and event // HANDLEs, but for now at least this will allow ::select() to not return Modified: lldb/trunk/source/Utility/SelectHelper.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/SelectHelper.cpp?rev=372592&r1=372591&r2=372592&view=diff ============================================================================== --- lldb/trunk/source/Utility/SelectHelper.cpp (original) +++ lldb/trunk/source/Utility/SelectHelper.cpp Mon Sep 23 05:03:56 2019 @@ -92,7 +92,7 @@ static void updateMaxFd(llvm::Optional<l lldb_private::Status SelectHelper::Select() { lldb_private::Status error; -#ifdef _MSC_VER +#ifdef _WIN32 // On windows FD_SETSIZE limits the number of file descriptors, not their // numeric value. lldbassert(m_fd_map.size() <= FD_SETSIZE); @@ -107,7 +107,7 @@ lldb_private::Status SelectHelper::Selec for (auto &pair : m_fd_map) { pair.second.PrepareForSelect(); const lldb::socket_t fd = pair.first; -#if !defined(__APPLE__) && !defined(_MSC_VER) +#if !defined(__APPLE__) && !defined(_WIN32) lldbassert(fd < static_cast<int>(FD_SETSIZE)); if (fd >= static_cast<int>(FD_SETSIZE)) { error.SetErrorStringWithFormat("%i is too large for select()", fd); Modified: lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp?rev=372592&r1=372591&r2=372592&view=diff ============================================================================== --- lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp (original) +++ lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp Mon Sep 23 05:03:56 2019 @@ -31,7 +31,7 @@ #include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/FileSpec.h" -#if defined(_MSC_VER) +#if defined(_WIN32) #include "lldb/Host/windows/windows.h" #include <objbase.h> #endif @@ -46,7 +46,7 @@ public: // Initialize and TearDown the plugin every time, so we get a brand new // AST every time so that modifications to the AST from each test don't // leak into the next test. -#if defined(_MSC_VER) +#if defined(_WIN32) ::CoInitializeEx(nullptr, COINIT_MULTITHREADED); #endif @@ -69,7 +69,7 @@ public: HostInfo::Terminate(); FileSystem::Terminate(); -#if defined(_MSC_VER) +#if defined(_WIN32) ::CoUninitialize(); #endif } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
