Merge pull request #996 from iSLC/master

Adjust thread-local local static variable syntax for MinGW/GCC.
2017-03-13 21:52:06 -07:00
parent cbd046e87f bbb7e3c5f5
commit ef9afd39f7
1 changed files with 5 additions and 1 deletions
--- a/src/LinearMath/btQuickprof.cpp
+++ b/src/LinearMath/btQuickprof.cpp
@@ -687,7 +687,11 @@ unsigned int btQuickprofGetCurrentThreadIndex2()
 {
 	const unsigned int kNullIndex = ~0U;
 #ifdef _WIN32
-	__declspec( thread ) static unsigned int sThreadIndex = kNullIndex;
+    #if defined(__MINGW32__) || defined(__MINGW64__)
+        static __thread unsigned int sThreadIndex = kNullIndex;
+    #else
+        __declspec( thread ) static unsigned int sThreadIndex = kNullIndex;
+    #endif
 #else
 #ifdef __APPLE__
 	#if TARGET_OS_IPHONE