dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-03-22 18:51:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix SDL1.2 build and type of xthreadInfo::threadId

Browse source
This commit is contained in:
Daniel Gibson 2023-01-16 03:22:01 +01:00
parent 07985cc5ea
commit e7e06d05f1
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/sys/sys_public.h
View file

@ -308,7 +308,7 @@ typedef int (*xthread_t)( void * );
typedef struct {
const char *name;
SDL_Thread *threadHandle;
unsigned int threadId;
unsigned long threadId;
} xthreadInfo;
void Sys_CreateThread( xthread_t function, void *parms, xthreadInfo &info, const char *name );

14
neo/sys/threads.cpp
View file

@ -36,6 +36,18 @@ If you have questions concerning this license or the applicable additional terms
#include "sys/sys_public.h"
#if SDL_MAJOR_VERSION < 2
// SDL1.2 doesn't have SDL_threadID but uses Uint32.
// this typedef helps using the same code for SDL1.2 and SDL2
typedef Uint32 SDL_threadID;
#endif
#if __cplusplus >= 201103
// xthreadinfo::threadId doesn't use SDL_threadID directly so we don't drag SDL headers into sys_public.h
// but we should still make sure that the type fits (in SDL1.2 it's Uint32, in SDL2 it's unsigned long)
static_assert( sizeof(SDL_threadID) <= sizeof(xthreadInfo::threadId), "xthreadInfo::threadId has unsuitable type!" );
#endif
static SDL_mutex *mutex[MAX_CRITICAL_SECTIONS] = { };
static SDL_cond *cond[MAX_TRIGGER_EVENTS] = { };
static bool signaled[MAX_TRIGGER_EVENTS] = { };
@ -298,7 +310,7 @@ const char *Sys_GetThreadName(int *index) {
Sys_EnterCriticalSection();
unsigned int id = SDL_ThreadID();
SDL_threadID id = SDL_ThreadID();
for (int i = 0; i < thread_count; i++) {
if (id == thread[i]->threadId) {