Revision: 30227
http://sourceforge.net/p/opalvoip/code/30227
Author: rjongbloed
Date: 2013-08-01 11:43:09 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
Fixed merge error
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2013-08-01 11:38:48 UTC (rev 30226)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2013-08-01 11:43:09 UTC (rev 30227)
@@ -855,11 +855,6 @@
snprintf(fn, sizeof(fn), "/proc/%u/task/%u/stat", getpid(), PX_linuxId);
return access(fn, R_OK) != 0;
#else
- // See if thread is still running, copy variable in case changes between two statements
- pthread_t id = m_threadId;
- if (id == PNullThreadIdentifier)
- return true;
-
int error = pthread_kill(id, 0);
switch (error) {
case 0 :
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|