maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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

llvm-svn: 372592
This commit is contained in:
Martin Storsjo 2019-09-23 12:03:56 +00:00
parent 02d3cc97fa
commit 8b98f12a7a
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/source/Core/IOHandler.cpp
View File

@ -579,7 +579,7 @@ void IOHandlerEditline::PrintAsync(Stream *stream, const char *s, size_t len) {
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(Stream *stream, const char *s, size_t len) {
}
#endif
IOHandler::PrintAsync(stream, s, len);
#ifdef _MSC_VER
#ifdef _WIN32
if (prompt)
IOHandler::PrintAsync(GetOutputStreamFile().get(), prompt,
strlen(prompt));

2
lldb/source/Host/common/UDPSocket.cpp
View File

@ -80,7 +80,7 @@ Status UDPSocket::Connect(llvm::StringRef name, bool child_processes_inherit,
&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)",

2
lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
View File

@ -564,7 +564,7 @@ ConnectionFileDescriptor::BytesAvailable(const Timeout<std::micro> &timeout,
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

4
lldb/source/Utility/SelectHelper.cpp
View File

@ -92,7 +92,7 @@ static void updateMaxFd(llvm::Optional<lldb::socket_t> &vold,
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::Select() {
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);

6
lldb/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp
View File

@ -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
}