From ae0067439fb8e102a4b48af31e236f7395d31559 Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Sat, 31 Oct 2015 19:14:25 +1100
Subject: [PATCH] Restore support for OSX 10.7 "Lion" and earlier

---
 include/bx/macros.h |  2 +-
 include/bx/os.h     | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/include/bx/macros.h b/include/bx/macros.h
index 4ee97a8..d94c29f 100644
--- a/include/bx/macros.h
+++ b/include/bx/macros.h
@@ -75,7 +75,7 @@
 #	if BX_CLANG_HAS_FEATURE(cxx_thread_local)
 #		define BX_THREAD_LOCAL __thread
 #	endif // BX_COMPILER_CLANG
-#	if BX_COMPILER_GCC >= 40200
+#	if (!BX_PLATFORM_OSX && (BX_COMPILER_GCC >= 40200)) || (BX_COMPILER_GCC >= 40500)
 #		define BX_THREAD_LOCAL __thread
 #	endif // BX_COMPILER_GCC
 #	define BX_ATTRIBUTE(_x) __attribute__( (_x) )
diff --git a/include/bx/os.h b/include/bx/os.h
index e188d57..0adf87b 100644
--- a/include/bx/os.h
+++ b/include/bx/os.h
@@ -133,14 +133,25 @@ namespace bx
 			: 0
 			;
 #elif BX_PLATFORM_OSX
+#ifdef MACH_TASK_BASIC_INFO
 		mach_task_basic_info info;
 		mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT;
 
-		int result = task_info(mach_task_self()
+		int const result = task_info(mach_task_self()
 				, MACH_TASK_BASIC_INFO
 				, (task_info_t)&info
 				, &infoCount
 				);
+#else // MACH_TASK_BASIC_INFO
+		task_basic_info info;
+		mach_msg_type_number_t infoCount = TASK_BASIC_INFO_COUNT;
+
+		int const result = task_info(mach_task_self()
+				, TASK_BASIC_INFO
+				, (task_info_t)&info
+				, &infoCount
+				);
+#endif // MACH_TASK_BASIC_INFO
 		if (KERN_SUCCESS != result)
 		{
 			return 0;