-#include "quakedef.h"
-#include "thread.h"
#include <SDL.h>
#include <SDL_thread.h>
+#include "quakedef.h"
+#include "thread.h"
int Thread_Init(void)
{
void *_Thread_CreateThread(int (*fn)(void *), void *data, const char *filename, int fileline)
{
+#if SDL_MAJOR_VERSION == 1
void *thread = (void *)SDL_CreateThread(fn, data);
+#else
+ void *thread = (void *)SDL_CreateThread(fn, filename, data);
+#endif
#ifdef THREADDEBUG
Sys_PrintfToTerminal("%p thread create %s:%i\n" , thread, filename, fileline);
#endif
void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileline)
{
- barrier_t *b = (barrier_t *)Z_Malloc(sizeof(barrier_t));
+ volatile barrier_t *b = (volatile barrier_t *) Z_Malloc(sizeof(barrier_t));
#ifdef THREADDEBUG
Sys_PrintfToTerminal("%p barrier create(%d) %s:%i\n", b, count, filename, fileline);
#endif
void _Thread_DestroyBarrier(void *barrier, const char *filename, int fileline)
{
- barrier_t *b = (barrier_t *) barrier;
+ volatile barrier_t *b = (volatile barrier_t *) barrier;
#ifdef THREADDEBUG
Sys_PrintfToTerminal("%p barrier destroy %s:%i\n", b, filename, fileline);
#endif
void _Thread_WaitBarrier(void *barrier, const char *filename, int fileline)
{
- barrier_t *b = (barrier_t *) barrier;
+ volatile barrier_t *b = (volatile barrier_t *) barrier;
#ifdef THREADDEBUG
Sys_PrintfToTerminal("%p barrier wait %s:%i\n", b, filename, fileline);
#endif
}
Thread_UnlockMutex(b->mutex);
}
-