summaryrefslogtreecommitdiffstats
path: root/lldb
diff options
context:
space:
mode:
Diffstat (limited to 'lldb')
-rw-r--r--lldb/source/Core/ConnectionFileDescriptor.cpp4
-rw-r--r--lldb/source/Host/common/Host.cpp2
-rw-r--r--lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp4
3 files changed, 7 insertions, 3 deletions
diff --git a/lldb/source/Core/ConnectionFileDescriptor.cpp b/lldb/source/Core/ConnectionFileDescriptor.cpp
index 2c49e671b71..ed876e52c9a 100644
--- a/lldb/source/Core/ConnectionFileDescriptor.cpp
+++ b/lldb/source/Core/ConnectionFileDescriptor.cpp
@@ -1380,7 +1380,7 @@ ConnectionFileDescriptor::SocketListen (const char *host_and_port, Error *error_
{
struct sockaddr_in accept_addr;
::memset (&accept_addr, 0, sizeof accept_addr);
-#ifndef __linux__
+#if !(defined (__linux__) || defined(_MSC_VER))
accept_addr.sin_len = sizeof accept_addr;
#endif
socklen_t accept_addr_len = sizeof accept_addr;
@@ -1402,7 +1402,7 @@ ConnectionFileDescriptor::SocketListen (const char *host_and_port, Error *error_
else
{
if (
-#ifndef __linux__
+#if !(defined(__linux__) || (defined(_MSC_VER)))
accept_addr_len == listen_addr.sockaddr_in().sin_len &&
#endif
accept_addr.sin_addr.s_addr == listen_addr.sockaddr_in().sin_addr.s_addr)
diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp
index fcd66583cc6..9f7bce764b3 100644
--- a/lldb/source/Host/common/Host.cpp
+++ b/lldb/source/Host/common/Host.cpp
@@ -13,12 +13,12 @@
#include <errno.h>
#include <limits.h>
#include <sys/types.h>
-#include <unistd.h>
#ifdef _WIN32
#include "lldb/Host/windows/windows.h"
#include <winsock2.h>
#include <WS2tcpip.h>
#else
+#include <unistd.h>
#include <dlfcn.h>
#include <grp.h>
#include <netdb.h>
diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
index b3ea8b481df..f27b2cee5b5 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -694,7 +694,11 @@ GDBRemoteCommunication::StartDebugserverProcess (const char *hostname,
if (::mktemp (named_pipe_path))
{
+#if defined(_MSC_VER)
+ if ( false )
+#else
if (::mkfifo(named_pipe_path, 0600) == 0)
+#endif
{
debugserver_args.AppendArgument("--named-pipe");
debugserver_args.AppendArgument(named_pipe_path);
OpenPOWER on IntegriCloud