Fix setinfo.

[xonotic/darkplaces.git] / thread_sdl.c

diff --git a/thread_sdl.c b/thread_sdl.c
index ca729c35bfb0498383b0edeff17636246ea1aeb5..65d14d7218b05d82e1b48d7d8f5682e7a2dedfd3 100644 (file)
--- a/thread_sdl.c
+++ b/thread_sdl.c
@@ -1,7 +1,7 @@
-#include "quakedef.h"
-#include "thread.h"
 #include <SDL.h>
 #include <SDL_thread.h>
+#include "quakedef.h"
+#include "thread.h"
 
 int Thread_Init(void)
 {
@@ -100,7 +100,7 @@ int _Thread_CondWait(void *cond, void *mutex, const char *filename, int fileline
 
 void *_Thread_CreateThread(int (*fn)(void *), void *data, const char *filename, int fileline)
 {
-       void *thread = (void *)SDL_CreateThread(fn, data);
+       void *thread = (void *)SDL_CreateThread(fn, filename, data);
 #ifdef THREADDEBUG
        Sys_PrintfToTerminal("%p thread create %s:%i\n"   , thread, filename, fileline);
 #endif
@@ -128,7 +128,7 @@ typedef struct {
 
 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
@@ -141,7 +141,7 @@ void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileli
 
 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
@@ -151,7 +151,7 @@ void _Thread_DestroyBarrier(void *barrier, const char *filename, int fileline)
 
 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
@@ -167,4 +167,3 @@ void _Thread_WaitBarrier(void *barrier, const char *filename, int fileline)
        }
        Thread_UnlockMutex(b->mutex);
 }
-