From b2884f159dc6adf4e8bbff91465d83fac578af5a Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 28 Sep 2000 22:46:36 +0000
Subject: (pthread_cancel): Don't do anything if cancelation is disabled.

---
 linuxthreads/cancel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linuxthreads')

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;
   }
-- 
cgit v1.2.3