diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-02-25 17:50:13 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-02-25 17:50:13 +0000 |
| commit | 0066e440c1398326e7d6ca43fae630b46a1b5a2d (patch) | |
| tree | 5c66f63ffb4a9ee1567aa6f6e7c5ac87dec238dc /winsup/cygwin/fhandler_tape.cc | |
| parent | e93954138f44023f4d1d75c3e572295d8230acad (diff) | |
| download | cygnal-0066e440c1398326e7d6ca43fae630b46a1b5a2d.tar.gz cygnal-0066e440c1398326e7d6ca43fae630b46a1b5a2d.tar.bz2 cygnal-0066e440c1398326e7d6ca43fae630b46a1b5a2d.zip | |
* fhandler_tape.cc (fhandler_dev_tape::_lock): Add cw_sig_restart to
cygwait call.
* thread.cc (pthread_mutex::lock): Ditto.
(semaphore::_timedwait): Fix formatting.
(semaphore::_wait): Ditto.
* thread.h (fast_mutex::lock): Ditto.
...and fix ChangeLog accordingly.
Diffstat (limited to 'winsup/cygwin/fhandler_tape.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_tape.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc index 5b09e4262..b24a0ee58 100644 --- a/winsup/cygwin/fhandler_tape.cc +++ b/winsup/cygwin/fhandler_tape.cc @@ -2,7 +2,7 @@ classes. Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, - 2010, 2011, 2012, 2013, 2014 Red Hat, Inc. + 2010, 2011, 2012, 2013, 2014, 2015 Red Hat, Inc. This file is part of Cygwin. @@ -1160,7 +1160,8 @@ fhandler_dev_tape::_lock (bool cancelable) /* O_NONBLOCK is only valid in a read or write call. Only those are cancelable. */ DWORD timeout = cancelable && is_nonblocking () ? 0 : INFINITE; - switch (cygwait (mt_mtx, timeout, cw_sig | cw_cancel | cw_cancel_self)) + switch (cygwait (mt_mtx, timeout, + cw_sig | cw_sig_restart | cw_cancel | cw_cancel_self)) { case WAIT_OBJECT_0: return true; |