Renamed SDL_ThreadID() to SDL_GetCurrentThreadID()
Also renamed SDL_threadID to SDL_ThreadID and made it Uint64 for consistency with other ID types
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
struct SDL_Mutex
|
||||
{
|
||||
int recursive;
|
||||
SDL_threadID owner;
|
||||
SDL_ThreadID owner;
|
||||
SDL_Semaphore *sem;
|
||||
};
|
||||
|
||||
@@ -65,7 +65,7 @@ void SDL_LockMutex(SDL_Mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS // clang doe
|
||||
{
|
||||
#ifndef SDL_THREADS_DISABLED
|
||||
if (mutex != NULL) {
|
||||
SDL_threadID this_thread = SDL_ThreadID();
|
||||
SDL_ThreadID this_thread = SDL_GetCurrentThreadID();
|
||||
if (mutex->owner == this_thread) {
|
||||
++mutex->recursive;
|
||||
} else {
|
||||
@@ -86,7 +86,7 @@ int SDL_TryLockMutex(SDL_Mutex *mutex)
|
||||
int retval = 0;
|
||||
#ifndef SDL_THREADS_DISABLED
|
||||
if (mutex) {
|
||||
SDL_threadID this_thread = SDL_ThreadID();
|
||||
SDL_ThreadID this_thread = SDL_GetCurrentThreadID();
|
||||
if (mutex->owner == this_thread) {
|
||||
++mutex->recursive;
|
||||
} else {
|
||||
@@ -110,7 +110,7 @@ void SDL_UnlockMutex(SDL_Mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS // clang d
|
||||
#ifndef SDL_THREADS_DISABLED
|
||||
if (mutex != NULL) {
|
||||
// If we don't own the mutex, we can't unlock it
|
||||
if (SDL_ThreadID() != mutex->owner) {
|
||||
if (SDL_GetCurrentThreadID() != mutex->owner) {
|
||||
SDL_assert(!"Tried to unlock a mutex we don't own!");
|
||||
return; // (undefined behavior!) SDL_SetError("mutex not owned by this thread");
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ struct SDL_RWLock
|
||||
#else
|
||||
SDL_Mutex *lock;
|
||||
SDL_Condition *condition;
|
||||
SDL_threadID writer_thread;
|
||||
SDL_ThreadID writer_thread;
|
||||
SDL_AtomicInt reader_count;
|
||||
SDL_AtomicInt writer_count;
|
||||
#endif
|
||||
|
||||
@@ -40,7 +40,7 @@ void SDL_SYS_SetupThread(const char *name)
|
||||
return;
|
||||
}
|
||||
|
||||
SDL_threadID SDL_ThreadID(void)
|
||||
SDL_ThreadID SDL_GetCurrentThreadID(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user