ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed threads for 64 bit. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2625 e3e1d417-86f3-4887-817a-d78f3d33393f
pull/27/merge
stan 2008-09-01 15:35:27 +00:00
parent a79594387c
commit e30da16498
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/zm_thread.cpp
View File

@ -259,13 +259,13 @@ void *Thread::mThreadFunc( void *arg )
thisPtr->mThreadCondition.signal();
thisPtr->mThreadMutex.unlock();
status = (void *)(thisPtr->run());
Debug( 2, "Exiting thread, status %d", (int)status );
Debug( 2, "Exiting thread, status %p", status );
}
catch ( const ThreadException &e )
{
Error( "%s", e.getMessage().c_str() );
status = (void *)-1;
Debug( 2, "Exiting thread after exception, status %d", (int)status );
Debug( 2, "Exiting thread after exception, status %p", status );
}
return( status );
}
@ -310,7 +310,7 @@ void Thread::join()
if ( pthread_join( mThread, &threadStatus ) < 0 )
throw ThreadException( stringtf( "Can't join sender thread: %s", strerror(errno) ) );
mRunning = false;
Debug( 1, "Thread %d exited, status %d", mPid, (int)threadStatus );
Debug( 1, "Thread %d exited, status %p", mPid, threadStatus );
}
else
{