[llvm-branch-commits] [lldb] r214766 - Merging r214291:

[Bill Wendling]

Author: void
Date: Mon Aug  4 15:01:31 2014
New Revision: 214766

URL: http://llvm.org/viewvc/llvm-project?rev=214766&view=rev
Log:
Merging r214291:
------------------------------------------------------------------------
r214291 | sylvestre | 2014-07-30 01:33:21 -0700 (Wed, 30 Jul 2014) | 11 lines

Use __linux__ macro throughout, instead of ocasional __linux.

__linux is not universally defined across all standards versions, compilers and architectures. Specifically at C99 and up, it's not defined in GCC on powerpc platform.

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=28314

Bugzilla: http://llvm.org/bugs/show_bug.cgi?id=20380

Patch by Dimitri John Ledkov <dimitri.ledkov at canonical.com>


------------------------------------------------------------------------

Modified:
    lldb/branches/release_35/   (props changed)
    lldb/branches/release_35/tools/lldb-mi/MICmnLogMediumFile.cpp
    lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.cpp
    lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.h

Propchange: lldb/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  4 15:01:31 2014
@@ -1,2 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
+/lldb/trunk:214291

Modified: lldb/branches/release_35/tools/lldb-mi/MICmnLogMediumFile.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_35/tools/lldb-mi/MICmnLogMediumFile.cpp?rev=214766&r1=214765&r2=214766&view=diff
==============================================================================
--- lldb/branches/release_35/tools/lldb-mi/MICmnLogMediumFile.cpp (original)
+++ lldb/branches/release_35/tools/lldb-mi/MICmnLogMediumFile.cpp Mon Aug  4 15:01:31 2014
@@ -28,7 +28,7 @@
 
 #if defined( _MSC_VER )
 	#include "MIUtilSystemWindows.h"
-#elif defined( __FreeBSD__ ) || defined( __linux )
+#elif defined( __FreeBSD__ ) || defined( __linux__ )
 	#include "MIUtilSystemLinux.h"
 #elif defined( __APPLE__ )
 	#include "MIUtilSystemOsx.h"

Modified: lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.cpp?rev=214766&r1=214765&r2=214766&view=diff
==============================================================================
--- lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.cpp (original)
+++ lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.cpp Mon Aug  4 15:01:31 2014
@@ -22,7 +22,7 @@
 // Include compiler configuration
 #include "MICmnConfig.h"
 
-#if defined( __FreeBSD__ ) || defined( __linux )
+#if defined( __FreeBSD__ ) || defined( __linux__ )
 
 // In-house headers:
 #include "MIUtilSystemLinux.h"
@@ -119,4 +119,4 @@ bool CMIUtilSystemLinux::GetLogFilesPath
 	return MIstatus::success;
 }
 
-#endif // #if defined( __linux )
+#endif // #if defined( __linux__ )

Modified: lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.h?rev=214766&r1=214765&r2=214766&view=diff
==============================================================================
--- lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.h (original)
+++ lldb/branches/release_35/tools/lldb-mi/MIUtilSystemLinux.h Mon Aug  4 15:01:31 2014
@@ -24,7 +24,7 @@
 // Include compiler configuration
 #include "MICmnConfig.h"
 
-#if defined( __FreeBSD__ ) || defined( __linux )
+#if defined( __FreeBSD__ ) || defined( __linux__ )
 
 // In-house headers:
 #include "MIUtilString.h"  
@@ -57,4 +57,4 @@ public:
 
 typedef CMIUtilSystemLinux CMIUtilSystem;
 
-#endif // #if defined( __linux )
+#endif // #if defined( __linux__ )