Rename 'thread_local' macro to 'SE1_THREADLOCAL' to avoid conflicts.

DreamyCecil · Feb 5, 2024 · 6045225 · 6045225
1 parent a1516c9
commit 6045225
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Sources/Engine/Base/Stream.cpp b/Sources/Engine/Base/Stream.cpp
@@ -48,9 +48,9 @@ ULONG _ulMaxLenghtOfSavingFile = (1UL<<20)*128;
 extern INDEX fil_bPreferZips = FALSE;
 
 // set if current thread has currently enabled stream handling
-static thread_local BOOL _bThreadCanHandleStreams = FALSE;
+static SE1_THREADLOCAL BOOL _bThreadCanHandleStreams = FALSE;
 // list of currently opened streams
-static thread_local CListHead *_plhOpenedStreams = NULL;
+static SE1_THREADLOCAL CListHead *_plhOpenedStreams = NULL;
 
 ULONG _ulVirtuallyAllocatedSpace = 0;
 ULONG _ulVirtuallyAllocatedSpaceTotal = 0;

diff --git a/Sources/Engine/Base/Synchronization.cpp b/Sources/Engine/Base/Synchronization.cpp
@@ -44,7 +44,7 @@ typedef struct {
    HANDLE hEvent;
 } OPTEX, *POPTEX;
 
-thread_local INDEX _iLastLockedMutex = 0;
+SE1_THREADLOCAL INDEX _iLastLockedMutex = 0;
 
 BOOL OPTEX_Initialize (POPTEX poptex) {
 

diff --git a/Sources/Engine/Base/Timer.cpp b/Sources/Engine/Base/Timer.cpp
@@ -55,7 +55,7 @@ static inline SQUAD ReadTSC(void)
 #pragma comment(lib, "winmm.lib")
 
 // current game time always valid for the currently active task
-static thread_local TIME _CurrentTickTimer = 0.0f;
+static SE1_THREADLOCAL TIME _CurrentTickTimer = 0.0f;
 
 // CTimer implementation
 

diff --git a/Sources/Engine/Network/MessageDispatcher.cpp b/Sources/Engine/Network/MessageDispatcher.cpp
@@ -48,7 +48,7 @@ class CMessageBuffer {
 };
 
 // the thread's local buffer
-static thread_local CMessageBuffer mbReceivedMessage = { 0,0 };
+static SE1_THREADLOCAL CMessageBuffer mbReceivedMessage = { 0,0 };
 
 void CMessageBuffer::Allocate(void)
 {

diff --git a/Sources/Engine/OS/PlatformSpecific.h b/Sources/Engine/OS/PlatformSpecific.h
@@ -18,15 +18,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define SE_INCL_PLATFORMSPECIFIC_H
 
 // Thread-local variables specifier
-#ifndef thread_local
+#ifndef SE1_THREADLOCAL
   #if SE1_WIN
-    #define thread_local __declspec(thread)
+    #define SE1_THREADLOCAL __declspec(thread)
   #elif __STDC_VERSION__ >= 201112L
-    #define thread_local _Thread_local
+    #define SE1_THREADLOCAL _Thread_local
   #else
-    #define thread_local __thread
+    #define SE1_THREADLOCAL __thread
   #endif
-#endif // thread_local
+#endif // SE1_THREADLOCAL
 
 // Unix-specific
 #if SE1_UNIX