diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | pthread_setcancelstate.c | 2 |
3 files changed, 8 insertions, 6 deletions
@@ -1,5 +1,9 @@ 2005-03-16 Ross Johnson <ross at callisto.canberra.edu.au>^M + * pthread_setcancelstate.c: Undo the last change. + +2005-03-16 Ross Johnson <ross at callisto.canberra.edu.au>^M + * pthread_setcancelstate.c: Don't check for an async cancel event if the library is using alertable async cancel.. @@ -1,7 +1,7 @@ -RELEASE 2.0.0^M --------------^M +RELEASE 2.0.0 +------------- (2005-03-16) -^M + General ------- @@ -25,7 +25,7 @@ cancel. See the README file (Prerequisites section) for info on adding alertable async cancelation. New features -------------^M +------------ * pthread_once() now supports init_routine cancellability. 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) { |