diff --git a/src/Cafe/OS/libs/coreinit/coreinit_Thread.cpp b/src/Cafe/OS/libs/coreinit/coreinit_Thread.cpp index a57b4473..e01fda73 100644 --- a/src/Cafe/OS/libs/coreinit/coreinit_Thread.cpp +++ b/src/Cafe/OS/libs/coreinit/coreinit_Thread.cpp @@ -45,8 +45,8 @@ namespace coreinit bool g_isMulticoreMode; - THREAD_LOCAL uint32 t_assignedCoreIndex; - THREAD_LOCAL Fiber* t_schedulerFiber; + thread_local uint32 t_assignedCoreIndex; + thread_local Fiber* t_schedulerFiber; struct OSHostThread { diff --git a/src/Cafe/OS/libs/nlibcurl/nlibcurl.cpp b/src/Cafe/OS/libs/nlibcurl/nlibcurl.cpp index 4923eae2..907ed67c 100644 --- a/src/Cafe/OS/libs/nlibcurl/nlibcurl.cpp +++ b/src/Cafe/OS/libs/nlibcurl/nlibcurl.cpp @@ -201,8 +201,8 @@ static_assert(sizeof(CURLMsg_t) <= 0xC, "sizeof(CURLMsg_t)"); size_t header_callback(char* buffer, size_t size, size_t nitems, void* userdata); -THREAD_LOCAL PPCConcurrentQueue* g_callerQueue; -THREAD_LOCAL ConcurrentQueue* g_threadQueue; +thread_local PPCConcurrentQueue* g_callerQueue; +thread_local ConcurrentQueue* g_threadQueue; void CurlWorkerThread(CURL_t* curl, PPCConcurrentQueue* callerQueue, ConcurrentQueue* threadQueue) { g_callerQueue = callerQueue; diff --git a/src/Common/precompiled.h b/src/Common/precompiled.h index dfc02dda..bb78f020 100644 --- a/src/Common/precompiled.h +++ b/src/Common/precompiled.h @@ -225,14 +225,6 @@ typedef union _LARGE_INTEGER { #define DEBUG_BREAK raise(SIGTRAP) #endif -#if defined(_MSC_VER) - #define THREAD_LOCAL __declspec(thread) -#elif defined(__GNUC__) - #define THREAD_LOCAL __thread -#else - #define THREAD_LOCAL thread_local -#endif - #if defined(_MSC_VER) #define DLLEXPORT __declspec(dllexport) #elif defined(__GNUC__)