[Common-cvs] system/platform/unix pthreadthreads.cpp,1.6,1.6.36.1
bobclark at helixcommunity.org bobclark at helixcommunity.orgUpdate of /cvsroot/common/system/platform/unix
In directory cvs:/tmp/cvs-serv14615/platform/unix
Modified Files:
Tag: hxclient_1_2_2_neptune
pthreadthreads.cpp
Log Message:
gcc 4.0 and OS X build fixes; cr gwright
Index: pthreadthreads.cpp
===================================================================
RCS file: /cvsroot/common/system/platform/unix/pthreadthreads.cpp,v
retrieving revision 1.6
retrieving revision 1.6.36.1
diff -u -d -r1.6 -r1.6.36.1
--- pthreadthreads.cpp 23 May 2003 23:07:15 -0000 1.6
+++ pthreadthreads.cpp 4 Nov 2005 21:41:25 -0000 1.6.36.1
@@ -63,7 +63,7 @@
HX_RESULT retVal = HXR_OK;
pthread_t threadID=0;
int nCode = pthread_create( &threadID, NULL, pfExecFunc, pArg );
- ulThreadID = threadID;
+ ulThreadID = (ULONG32)threadID;
if(nCode!=0)
{
ulThreadID = 0;
@@ -75,7 +75,7 @@
ULONG32 HXPthreadThread::_thread_self()
{
- return pthread_self();
+ return (ULONG32)pthread_self();
}
void HXPthreadThread::_thread_exit(UINT32 unExitCode)
@@ -85,13 +85,13 @@
void HXPthreadThread::_thread_cancel(ULONG32 ulThreadID)
{
- pthread_cancel( ulThreadID );
+ pthread_cancel( (pthread_t)ulThreadID );
}
ULONG32 HXPthreadThread::_thread_join(ULONG32 ulThreadID)
{
void* pvRetVal = NULL;
- pthread_join( ulThreadID, &pvRetVal );
+ pthread_join( (pthread_t)ulThreadID, &pvRetVal );
return (ULONG32)(PTR_INT)pvRetVal;
}