From e74acb9f56d1a46ba56e007352c2170c835ecb48 Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Wed, 16 Mar 2005 01:36:11 +0000
Subject: ''

---
 pthread_setcancelstate.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pthread_setcancelstate.c')

diff --git a/pthread_setcancelstate.c b/pthread_setcancelstate.c
index 002cfe5..12fdda4 100644
--- a/pthread_setcancelstate.c
+++ b/pthread_setcancelstate.c
@@ -103,8 +103,10 @@ 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