[Lldb-commits] [lldb] r203651 - Replace some _MSC_VER with _WIN32.

[Hafiz Abid Qadeer]

Author: abidh
Date: Wed Mar 12 05:45:23 2014
New Revision: 203651

URL: http://llvm.org/viewvc/llvm-project?rev=203651&view=rev
Log:
Replace some _MSC_VER with _WIN32.
This allows to use some code for mingw which was previously only
used for MSVC.

Modified:
    lldb/trunk/include/lldb/lldb-defines.h
    lldb/trunk/source/Core/ConnectionFileDescriptor.cpp
    lldb/trunk/source/Host/common/File.cpp
    lldb/trunk/source/Host/common/SocketAddress.cpp
    lldb/trunk/source/Host/windows/EditLineWin.cpp
    lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
    lldb/trunk/source/Target/Process.cpp
    lldb/trunk/tools/driver/Platform.cpp
    lldb/trunk/tools/driver/Platform.h

Modified: lldb/trunk/include/lldb/lldb-defines.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/lldb-defines.h?rev=203651&r1=203650&r2=203651&view=diff
==============================================================================
--- lldb/trunk/include/lldb/lldb-defines.h (original)
+++ lldb/trunk/include/lldb/lldb-defines.h Wed Mar 12 05:45:23 2014
@@ -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)

Modified: lldb/trunk/source/Core/ConnectionFileDescriptor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ConnectionFileDescriptor.cpp?rev=203651&r1=203650&r2=203651&view=diff
==============================================================================
--- lldb/trunk/source/Core/ConnectionFileDescriptor.cpp (original)
+++ lldb/trunk/source/Core/ConnectionFileDescriptor.cpp Wed Mar 12 05:45:23 2014
@@ -1380,7 +1380,7 @@ ConnectionFileDescriptor::SocketListen (
         {
             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 @@ ConnectionFileDescriptor::SocketListen (
             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)

Modified: lldb/trunk/source/Host/common/File.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/File.cpp?rev=203651&r1=203650&r2=203651&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/File.cpp (original)
+++ lldb/trunk/source/Host/common/File.cpp Wed Mar 12 05:45:23 2014
@@ -887,7 +887,7 @@ File::CalculateInteractiveAndTerminal ()
     {
         m_is_interactive = eLazyBoolNo;
         m_is_real_terminal = eLazyBoolNo;
-#ifdef _MSC_VER
+#ifdef _WIN32
         if (_isatty(fd))
         {
             m_is_interactive = eLazyBoolYes;

Modified: lldb/trunk/source/Host/common/SocketAddress.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/SocketAddress.cpp?rev=203651&r1=203650&r2=203651&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/SocketAddress.cpp (original)
+++ lldb/trunk/source/Host/common/SocketAddress.cpp Wed Mar 12 05:45:23 2014
@@ -11,7 +11,7 @@
 #include <stddef.h>
 
 // C Includes
-#if !defined(_MSC_VER)
+#if !defined(_WIN32)
 #include <arpa/inet.h>
 #endif
 #include <assert.h>

Modified: lldb/trunk/source/Host/windows/EditLineWin.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/windows/EditLineWin.cpp?rev=203651&r1=203650&r2=203651&view=diff
==============================================================================
--- lldb/trunk/source/Host/windows/EditLineWin.cpp (original)
+++ lldb/trunk/source/Host/windows/EditLineWin.cpp Wed Mar 12 05:45:23 2014
@@ -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"
 

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp?rev=203651&r1=203650&r2=203651&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp Wed Mar 12 05:45:23 2014
@@ -702,7 +702,7 @@ GDBRemoteCommunication::StartDebugserver
 
                 if (::mktemp (named_pipe_path))
                 {
-#if defined(_MSC_VER)
+#if defined(_WIN32)
                     if ( false )
 #else
                     if (::mkfifo(named_pipe_path, 0600) == 0)

Modified: lldb/trunk/source/Target/Process.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=203651&r1=203650&r2=203651&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Wed Mar 12 05:45:23 2014
@@ -4771,7 +4771,7 @@ public:
             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 @@ public:
                 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;

Modified: lldb/trunk/tools/driver/Platform.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Platform.cpp?rev=203651&r1=203650&r2=203651&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Platform.cpp (original)
+++ lldb/trunk/tools/driver/Platform.cpp Wed Mar 12 05:45:23 2014
@@ -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>

Modified: lldb/trunk/tools/driver/Platform.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Platform.h?rev=203651&r1=203650&r2=203651&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Platform.h (original)
+++ lldb/trunk/tools/driver/Platform.h Wed Mar 12 05:45:23 2014
@@ -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