diff options
| author | Jason Evans <jasone@FreeBSD.org> | 2000-01-19 07:04:50 +0000 |
|---|---|---|
| committer | Jason Evans <jasone@FreeBSD.org> | 2000-01-19 07:04:50 +0000 |
| commit | 0a3fa43c7e06dfbd6ddde4767d9c8a0c6a2ad51f (patch) | |
| tree | d60f837da3362893d30d022990c52c439190405b /lib/libpthread/thread/thr_join.c | |
| parent | 1c12990b99e0a50adad4fb4691b64378de2f1b12 (diff) | |
Notes
Diffstat (limited to 'lib/libpthread/thread/thr_join.c')
| -rw-r--r-- | lib/libpthread/thread/thr_join.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libpthread/thread/thr_join.c b/lib/libpthread/thread/thr_join.c index 155dc6435e83..1cffc96eaea3 100644 --- a/lib/libpthread/thread/thr_join.c +++ b/lib/libpthread/thread/thr_join.c @@ -97,11 +97,9 @@ pthread_join(pthread_t pthread, void **thread_return) _thread_kern_sig_undefer(); - if ((_thread_run->cancelflags & PTHREAD_CANCEL_NEEDED) != 0) { - _thread_run->cancelflags &= ~PTHREAD_CANCEL_NEEDED; - _thread_exit_cleanup(); - pthread_exit(PTHREAD_CANCELED); - } + if (_thread_run->interrupted != 0 && + _thread_run->continuation != NULL) + _thread_run->continuation(_thread_run); /* Check if the thread is not detached: */ if ((pthread->attr.flags & PTHREAD_DETACHED) == 0) { |