about summary refs log tree commit diff
path: root/linuxthreads/cancel.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-09-28 22:46:36 +0000
committerUlrich Drepper <drepper@redhat.com>2000-09-28 22:46:36 +0000
commitb2884f159dc6adf4e8bbff91465d83fac578af5a (patch)
tree4af45318041dfc643f45c6276b857e69b05fd42f /linuxthreads/cancel.c
parent4ccacaa1ab70fea060ba6c1509e8b14e61c11d8c (diff)
downloadglibc-b2884f159dc6adf4e8bbff91465d83fac578af5a.tar.gz
glibc-b2884f159dc6adf4e8bbff91465d83fac578af5a.tar.xz
glibc-b2884f159dc6adf4e8bbff91465d83fac578af5a.zip
(pthread_cancel): Don't do anything if cancelation is disabled.
Diffstat (limited to 'linuxthreads/cancel.c')
-rw-r--r--linuxthreads/cancel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linuxthreads/cancel.c b/linuxthreads/cancel.c
index a51e8ccfc3..370a373c77 100644
--- a/linuxthreads/cancel.c
+++ b/linuxthreads/cancel.c
@@ -64,7 +64,7 @@ int pthread_cancel(pthread_t thread)
 
   th = handle->h_descr;
 
-  if (th->p_canceled) {
+  if (th->p_cancelstate == PTHREAD_CANCEL_DISABLE || th->p_canceled) {
     __pthread_unlock(&handle->h_lock);
     return 0;
   }