Index: include/lldb/lldb-defines.h
===================================================================
--- include/lldb/lldb-defines.h	(revision 203501)
+++ include/lldb/lldb-defines.h	(working copy)
@@ -12,7 +12,7 @@
 
 #include "lldb/lldb-types.h"
 
-#if defined (_MSC_VER)
+#if defined (_WIN32)
     #if defined(EXPORT_LIBLLDB)
         #define  LLDB_API __declspec(dllexport)
     #elif defined(IMPORT_LIBLLDB)
Index: tools/driver/Platform.cpp
===================================================================
--- tools/driver/Platform.cpp	(revision 203501)
+++ tools/driver/Platform.cpp	(working copy)
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // this file is only relevant for Visual C++
-#if defined( _MSC_VER )
+#if defined( _WIN32 )
 
 #include <process.h>
 #include <assert.h>
Index: tools/driver/Platform.h
===================================================================
--- tools/driver/Platform.h	(revision 203505)
+++ tools/driver/Platform.h	(working copy)
@@ -12,7 +12,7 @@
 
 #include "lldb/Host/HostGetOpt.h"
 
-#if defined( _MSC_VER )
+#if defined( _WIN32 )
 
     // this will stop signal.h being included
     #define _INC_SIGNAL
Index: source/Host/common/File.cpp
===================================================================
--- source/Host/common/File.cpp	(revision 203501)
+++ source/Host/common/File.cpp	(working copy)
@@ -887,7 +887,7 @@
     {
         m_is_interactive = eLazyBoolNo;
         m_is_real_terminal = eLazyBoolNo;
-#ifdef _MSC_VER
+#ifdef _WIN32
         if (_isatty(fd))
         {
             m_is_interactive = eLazyBoolYes;
Index: source/Host/common/SocketAddress.cpp
===================================================================
--- source/Host/common/SocketAddress.cpp	(revision 203501)
+++ source/Host/common/SocketAddress.cpp	(working copy)
@@ -11,7 +11,7 @@
 #include <stddef.h>
 
 // C Includes
-#if !defined(_MSC_VER)
+#if !defined(_WIN32)
 #include <arpa/inet.h>
 #endif
 #include <assert.h>
Index: source/Host/windows/EditLineWin.cpp
===================================================================
--- source/Host/windows/EditLineWin.cpp	(revision 203501)
+++ source/Host/windows/EditLineWin.cpp	(working copy)
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 // this file is only relevant for Visual C++
-#if defined( _MSC_VER )
+#if defined( _WIN32 )
 
 #include "lldb/Host/windows/windows.h"
 
Index: source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
===================================================================
--- source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp	(revision 203501)
+++ source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp	(working copy)
@@ -702,7 +702,7 @@
 
                 if (::mktemp (named_pipe_path))
                 {
-#if defined(_MSC_VER)
+#if defined(_WIN32)
                     if ( false )
 #else
                     if (::mkfifo(named_pipe_path, 0600) == 0)
Index: source/Target/Process.cpp
===================================================================
--- source/Target/Process.cpp	(revision 203501)
+++ source/Target/Process.cpp	(working copy)
@@ -4771,7 +4771,7 @@
             return true;
 
         int fds[2];
-#ifdef _MSC_VER
+#ifdef _WIN32
         // pipe is not supported on windows so default to a fail condition
         int err = 1;
 #else
@@ -4812,7 +4812,7 @@
                 terminal.SetCanonical(false);
                 terminal.SetEcho(false);
 // FD_ZERO, FD_SET are not supported on windows
-#ifndef _MSC_VER
+#ifndef _WIN32
                 while (!GetIsDone())
                 {
                     fd_set read_fdset;
Index: source/Core/ConnectionFileDescriptor.cpp
===================================================================
--- source/Core/ConnectionFileDescriptor.cpp	(revision 203505)
+++ source/Core/ConnectionFileDescriptor.cpp	(working copy)
@@ -1380,7 +1380,7 @@
         {
             struct sockaddr_in accept_addr;
             ::memset (&accept_addr, 0, sizeof accept_addr);
-#if !(defined (__linux__) || defined(_MSC_VER))
+#if !(defined (__linux__) || defined(_WIN32))
             accept_addr.sin_len = sizeof accept_addr;
 #endif
             socklen_t accept_addr_len = sizeof accept_addr;
@@ -1402,7 +1402,7 @@
             else
             {
                 if (
-#if !(defined(__linux__) || (defined(_MSC_VER)))
+#if !(defined(__linux__) || (defined(_WIN32)))
                     accept_addr_len == listen_addr.sockaddr_in().sin_len &&
 #endif
                     accept_addr.sin_addr.s_addr == listen_addr.sockaddr_in().sin_addr.s_addr)