actually fix the barrier typecasts... these really need to be volatile due to the...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11696 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=3fbfd7e96ea812bb470aad0bc089ef7f03d3516f

diff --git a/thread_pthread.c b/thread_pthread.c
index 27ccf5fbd8cd5a46226627a5a63bf7b28c527857..e86b2c3828fde8c2a5f387290ed38d9e11ca270c 100644 (file)
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -182,7 +182,7 @@ typedef struct {
 
 void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileline)
 {
-       barrier_t *b = 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
@@ -195,7 +195,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
@@ -205,7 +205,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

diff --git a/thread_sdl.c b/thread_sdl.c
index ca729c35bfb0498383b0edeff17636246ea1aeb5..d2567809a90913a38c104dbd685c220e4dd855f8 100644 (file)
--- a/thread_sdl.c
+++ b/thread_sdl.c
@@ -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);
 }
-       

diff --git a/thread_win.c b/thread_win.c
index 692a6f11735880c18fdccd1c48c5f5c22fbfe77a..8564ca195dd64fa416f4557efe3a871fe535c59e 100644 (file)
--- a/thread_win.c
+++ b/thread_win.c
@@ -262,7 +262,7 @@ typedef struct {
 
 void *_Thread_CreateBarrier(unsigned int count, const char *filename, int fileline)
 {
-       barrier_t *b = 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
@@ -275,7 +275,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
@@ -285,7 +285,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