''

2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 08945d2..5bedad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 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
 	few races involving 'done' flag setting; fix incorrect 'done'
 	assignment.
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)
     {