diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-02-23 13:32:16 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-02-23 13:32:16 +0000 |
| commit | b6e4adaaf1a4248907844a32fa300ee95e71bd3c (patch) | |
| tree | 1f6d0e26fd6f9928f815db10bda9b4d995785255 /winsup/cygwin/cygwait.cc | |
| parent | f6ec73c0185087197e08fcaf6c58fd1e1b422da4 (diff) | |
| download | cygnal-b6e4adaaf1a4248907844a32fa300ee95e71bd3c.tar.gz cygnal-b6e4adaaf1a4248907844a32fa300ee95e71bd3c.tar.bz2 cygnal-b6e4adaaf1a4248907844a32fa300ee95e71bd3c.zip | |
* cygwait.cc (cygwait): Move setting res to WAIT_SIGNALED to clarify
when WAIT_SIGNALED is returned to the caller.
Diffstat (limited to 'winsup/cygwin/cygwait.cc')
| -rw-r--r-- | winsup/cygwin/cygwait.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/cygwait.cc b/winsup/cygwin/cygwait.cc index b6bffa27f..4d2b8a745 100644 --- a/winsup/cygwin/cygwait.cc +++ b/winsup/cygwin/cygwait.cc @@ -1,6 +1,6 @@ /* cygwait.h - Copyright 2011, 2012, 2013 Red Hat, Inc. + Copyright 2011, 2012, 2013, 2015 Red Hat, Inc. This file is part of Cygwin. @@ -87,9 +87,10 @@ cygwait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask) if (!sig) continue; if (is_cw_sig_eintr || (is_cw_sig_cont && sig == SIGCONT)) - res = WAIT_SIGNALED; /* caller will deal with signals */ + ; else if (_my_tls.call_signal_handler ()) continue; + res = WAIT_SIGNALED; /* caller will deal with signals */ } break; } |