diff options
| author | Christopher Faylor <me@cgf.cx> | 2012-06-19 00:38:02 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2012-06-19 00:38:02 +0000 |
| commit | 2addde8cb1e794a9818b9417839524dbc05401da (patch) | |
| tree | 389e9271ffc3ea88d97116b52fa8e838889ab12f /winsup/cygwin/cygwait.cc | |
| parent | af5cd145835d35519af02d0d226f67eb777e4945 (diff) | |
| download | cygnal-2addde8cb1e794a9818b9417839524dbc05401da.tar.gz cygnal-2addde8cb1e794a9818b9417839524dbc05401da.tar.bz2 cygnal-2addde8cb1e794a9818b9417839524dbc05401da.zip | |
Revert errneous checkin.
Check in actual change associated with ChangeLog.
Diffstat (limited to 'winsup/cygwin/cygwait.cc')
| -rw-r--r-- | winsup/cygwin/cygwait.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/winsup/cygwin/cygwait.cc b/winsup/cygwin/cygwait.cc index 377012a1a..9b22bd01f 100644 --- a/winsup/cygwin/cygwait.cc +++ b/winsup/cygwin/cygwait.cc @@ -21,8 +21,6 @@ #define is_cw_sig_handle (mask & (is_cw_sig | is_cw_sig_eintr)) -TIMER_BASIC_INFORMATION cw_nowait; - DWORD cancelable_wait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) { @@ -85,11 +83,8 @@ cancelable_wait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) /* all set */; else if (is_cw_sig_eintr) res = WAIT_SIGNALED; - else - { - _my_tls.call_signal_handler (); - continue; - } + else if (_my_tls.call_signal_handler () || &_my_tls != _main_tls) + continue; break; } |