diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-12-04 22:32:00 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-12-04 22:32:00 +0400 |
| commit | 79e59d522afe5692c09ab21eade08947eca3ec19 (patch) | |
| tree | cd44280ba1c10616a5bb8d19ed01f2681d75045c /winsup/cygwin/fhandler_fifo.cc | |
| parent | 4510afa90d42eec08a2ec91f4203ed126ab998c8 (diff) | |
* sigproc.cc (cygWFMO): Don't assume that cancellable event is always
available.
* fhandler_dsp.cc (fhandler_dev_dsp::Audio_out::waitforspace): Use cygWFMO
instead of WaitForMultipleObjects.
(fhandler_dev_dsp::Audio_in::waitfordata): Ditto.
* fhandler_fifo.cc (fhandler_fifo::wait): Ditto.
* fhandler_serial.cc (fhandler_serial::raw_read): Ditto.
(fhandler_serial::raw_write): Ditto.
* fhandler_tty.cc (fhandler_pty_slave::read): Ditto.
* select.cc (cygwin_select): Ditto for degenerate case.
Diffstat (limited to 'winsup/cygwin/fhandler_fifo.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_fifo.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index a7aecef96..ae5705483 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -210,15 +210,13 @@ fhandler_fifo::wait (HANDLE h) else what = "overlapped event"; #endif - HANDLE w4[3] = {h, signal_arrived, pthread::get_cancel_event ()}; - /* Set the wait to zero for non-blocking I/O-related events. */ DWORD wait = ((h == read_ready || h == write_ready) && get_flags () & O_NONBLOCK) ? 0 : INFINITE; debug_only_printf ("waiting for %s", what); /* Wait for the event. Set errno, as appropriate if something goes wrong. */ - switch (WaitForMultipleObjects (3, w4, false, wait)) + switch (cygWFMO (1, wait)) { case WAIT_OBJECT_0: debug_only_printf ("successfully waited for %s", what); |