diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-12-03 10:06:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-12-03 10:06:32 +0000 |
| commit | 57744477a72d9566b0048c857de7bf4ca172f5d6 (patch) | |
| tree | f5919507034846a2d569ae091d8079bc446f4068 | |
| parent | 8318f437395a74f8268613b76138f0b93c07fea1 (diff) | |
| download | ATCD-57744477a72d9566b0048c857de7bf4ca172f5d6.tar.gz | |
Mon Dec 3 10:06:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1852df862d4..a42e06d4d33 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 3 10:06:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/OS_NS_Thread.inl: + Removed not needed check for pthread_cancel + Mon Dec 3 10:02:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-aix-5.x.h: diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 3d183bb83ab..5ff7bea50d7 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -2561,16 +2561,9 @@ ACE_OS::thr_cancel (ACE_thread_t thr_id) #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL) int result; -# ifdef pthread_cancel - // If it's a macro we can't say "pthread_cancel"... - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cancel (thr_id), - result), - int, -1); -# else - ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cancel (thr_id), - result), - int, -1); -# endif /* pthread_cancel */ + ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cancel (thr_id), + result), + int, -1); # elif defined (ACE_HAS_VXTHREADS) ACE_OSCALL_RETURN (::taskDelete (thr_id), int, -1); # else /* Could be ACE_HAS_PTHREADS && ACE_LACKS_PTHREAD_CANCEL */ |