* posix_ipc.cc (ipc_cond_timedwait): Only wait for pthread's

	cancel_event if thread's cancelability isn't disabled.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 36fddb45da5c2c6ce201f7d49b1408454ad34700..569e7d9b789f9585c9e3c3b66f16b003764d4631 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-29  Corinna Vinschen  <corinna@vinschen.de>
+
+       * posix_ipc.cc (ipc_cond_timedwait): Only wait for pthread's
+       cancel_event if thread's cancelability isn't disabled.
+
 2011-04-28  Corinna Vinschen  <corinna@vinschen.de>
 
        * advapi32.cc (SetSecurityDescriptorDacl): Remove.

diff --git a/winsup/cygwin/posix_ipc.cc b/winsup/cygwin/posix_ipc.cc
index 227282fcb98a27322da7d0d8b0970dec3db435f0..88f5a2e5e87f542609ef8fe35298392d38822742 100644 (file)
--- a/winsup/cygwin/posix_ipc.cc
+++ b/winsup/cygwin/posix_ipc.cc
@@ -181,7 +181,8 @@ ipc_cond_timedwait (HANDLE evt, HANDLE mtx, const struct timespec *abstime)
   int ret = 0;
 
   thread = pthread::self ();
-  if (thread && thread->cancel_event)
+  if (thread && thread->cancel_event
+      && thread->cancelstate != PTHREAD_CANCEL_DISABLE)
     w4[cnt++] = thread->cancel_event;
   if (abstime)
     {