JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
cancel_event if thread's cancelability isn't disabled.
This commit is contained in:
Corinna Vinschen
2011-04-29 07:22:07 +00:00
parent 530994bdce
commit 541820d0ee
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -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> 2011-04-28 Corinna Vinschen <corinna@vinschen.de>
* advapi32.cc (SetSecurityDescriptorDacl): Remove. * advapi32.cc (SetSecurityDescriptorDacl): Remove.

3
winsup/cygwin/posix_ipc.cc
View File

@@ -181,7 +181,8 @@ ipc_cond_timedwait (HANDLE evt, HANDLE mtx, const struct timespec *abstime)
int ret = 0; int ret = 0;
thread = pthread::self (); thread = pthread::self ();
if (thread && thread->cancel_event) if (thread && thread->cancel_event
&& thread->cancelstate != PTHREAD_CANCEL_DISABLE)
w4[cnt++] = thread->cancel_event; w4[cnt++] = thread->cancel_event;
if (abstime) if (abstime)
{ {