adrien/netradiant-custom
1
Fork 0
mirror of https://github.com/Garux/netradiant-custom.git synced 2026-09-28 00:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://gitlab.com/xonotic/netradiant into Melanosuchus/modernize

Browse Source
This commit is contained in:
Mattia Basaglia
2015-07-22 10:22:56 +02:00
parent 90a5797749 c2d78b9674
commit c3d2ea27c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/quake3/common/threads.c
+2 -2
View File
@@ -538,7 +538,7 @@ void RunThreadsOn( int workcnt, qboolean showpacifier, void ( *func )( int ) ){
size_t stacksize;
int start, end;
int i = 0, status = 0;
int i = 0;
start = I_FloatTime();
pacifier = showpacifier;
@@ -582,7 +582,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], NULL ) != 0 ) {
Error( "pthread_join failed" );
}
}