* posix_ipc.cc (ipc_cond_timedwait): Only wait for pthread's
cancel_event if thread's cancelability isn't disabled.
This commit is contained in:
parent
530994bdce
commit
541820d0ee
winsup/cygwin
@ -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.
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user