From 37ed3c02272ff6ef9786bdce2271dd98ab3bad9e Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Wed, 16 Mar 2005 05:21:27 +0000
Subject: ''

---
 ChangeLog                | 4 ++++
 pthread_setcancelstate.c | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 08945d2..5bedad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-16  Ross Johnson  <ross at callisto.canberra.edu.au>
+
+	* pthread_setcancelstate.c: Undo the last change.
+
 2005-03-16  Ross Johnson  <ross at callisto.canberra.edu.au>
 
 	* pthread_once.c (pthread_once): Fix faulty 'done' check; fix a
diff --git a/pthread_setcancelstate.c b/pthread_setcancelstate.c
index 12fdda4..002cfe5 100644
--- a/pthread_setcancelstate.c
+++ b/pthread_setcancelstate.c
@@ -103,10 +103,8 @@ pthread_setcancelstate (int state, int *oldstate)
 
   /*
    * Check if there is a pending asynchronous cancel
-   * only if we don't have alertable async cancel.
    */
   if (state == PTHREAD_CANCEL_ENABLE
-      && (ptw32_features & PTW32_ALERTABLE_ASYNC_CANCEL) == 0
       && sp->cancelType == PTHREAD_CANCEL_ASYNCHRONOUS
       && WaitForSingleObject (sp->cancelEvent, 0) == WAIT_OBJECT_0)
     {
-- 
cgit v1.2.3