diff options
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/ldap.cc | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7325c0b5f..12dd7734d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2015-02-26 Corinna Vinschen <corinna@vinschen.de> + * ldap.cc (cyg_ldap::wait): Call cygwait with cw_infinite timeout value + and with cw_sig_restart instead of cw_sig_eintr. Drop useless + _my_tls.call_signal_handler call. Return EIO if cygwait failed. + +2015-02-26 Corinna Vinschen <corinna@vinschen.de> + * posix_ipc.cc (ipc_mutex_lock): Revert unneeded call to signal handler. 2015-02-26 Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/cygwin/ldap.cc b/winsup/cygwin/ldap.cc index 4935d467f..b902d9df8 100644 --- a/winsup/cygwin/ldap.cc +++ b/winsup/cygwin/ldap.cc @@ -142,11 +142,10 @@ cyg_ldap::wait (cygthread *thr) { if (!thr) return EIO; - if (cygwait (*thr, INFINITE, cw_sig | cw_sig_eintr) != WAIT_OBJECT_0) + if (cygwait (*thr, cw_infinite, cw_sig | cw_sig_restart) != WAIT_OBJECT_0) { thr->terminate_thread (); - _my_tls.call_signal_handler (); - return EINTR; + return EIO; } thr->detach (); return 0; |