From: namespace <namespace>
Date: Sat, 13 Nov 2010 13:36:27 +0000 (+0000)
Subject: pthread_join Fix from Nerius Landys
X-Git-Tag: xonotic-v0.7.0~16^2~12^2~56
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=11bb5b57208c958da43fb3e632e6b15210c5270e;p=xonotic%2Fnetradiant.git

pthread_join Fix from Nerius Landys

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@333 8a3a26a2-13c4-0310-b231-cf6edde360e5
---

diff --git a/tools/quake3/common/threads.c b/tools/quake3/common/threads.c
index abdf2055..2e5e9032 100644
--- a/tools/quake3/common/threads.c
+++ b/tools/quake3/common/threads.c
@@ -520,7 +520,8 @@ void RunThreadsOn (int workcnt, qboolean showpacifier, void(*func)(int))
   pthread_t work_threads[MAX_THREADS];
   
   int	  start, end;
-  int   i=0, status=0;
+  int   i=0;
+  void *exit_value;
   
   start     = I_FloatTime ();
   pacifier  = showpacifier;
@@ -556,7 +557,7 @@ void RunThreadsOn (int workcnt, qboolean showpacifier, void(*func)(int))
     }
     for (i=0 ; i<numthreads ; i++)
     {
-      if(pthread_join(work_threads[i], (void **)&status) != 0)
+      if(pthread_join(work_threads[i], &exit_value) != 0)
         Error("pthread_join failed");
     }
     pthread_mutexattr_destroy(&mattrib);