Fixed conflicts

Utilities/SMutex.cpp

@@ -6,9 +6,9 @@ __forceinline void SM_Sleep()
 	Sleep(1);
 }
 
-__forceinline DWORD SM_GetCurrentThreadId()
+__forceinline size_t SM_GetCurrentThreadId()
 {
-	return GetCurrentThreadId();
+	return std::this_thread::get_id().hash();
 }
 
 __forceinline u32 SM_GetCurrentCPUThreadId()
@@ -23,4 +23,4 @@ __forceinline u32 SM_GetCurrentCPUThreadId()
 __forceinline be_t<u32> SM_GetCurrentCPUThreadIdBE()
 {
 	return SM_GetCurrentCPUThreadId();
-}
+}