Commit 5f262c81 authored by Bill Wendling's avatar Bill Wendling
Browse files

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@canonical.com>


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

llvm-svn: 214766
parent 569deba6

lldb/tools/lldb-mi/MICmnLogMediumFile.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"

lldb/tools/lldb-mi/MIUtilSystemLinux.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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( CMIUtilString & vrwFileNamePath ) cons 
	return MIstatus::success;

}



#endif // #if defined( __linux )
 
#endif // #if defined( __linux__ )

lldb/tools/lldb-mi/MIUtilSystemLinux.h

+2 −2
Original line number Diff line number Diff line
@@ -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__ )