* thread.cc (cancelable_wait): Remove test for main thread.
* fhandler_fifo.cc (fhandler_fifo::open_nonserver): Ditto.
This commit is contained in:
parent
27dd7bfbcd
commit
183ad8597c
|
@ -1,3 +1,8 @@
|
||||||
|
2011-05-02 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
|
* thread.cc (cancelable_wait): Remove test for main thread.
|
||||||
|
* fhandler_fifo.cc (fhandler_fifo::open_nonserver): Ditto.
|
||||||
|
|
||||||
2011-05-02 Corinna Vinschen <corinna@vinschen.de>
|
2011-05-02 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* fhndler_tty.cc (andler_pty_master::process_slave_output): Make
|
* fhndler_tty.cc (andler_pty_master::process_slave_output): Make
|
||||||
|
|
|
@ -47,9 +47,7 @@ fhandler_fifo::open_nonserver (const char *npname, unsigned low_flags,
|
||||||
FILE_FLAG_OVERLAPPED, NULL);
|
FILE_FLAG_OVERLAPPED, NULL);
|
||||||
if (h != INVALID_HANDLE_VALUE || GetLastError () != ERROR_PIPE_NOT_CONNECTED)
|
if (h != INVALID_HANDLE_VALUE || GetLastError () != ERROR_PIPE_NOT_CONNECTED)
|
||||||
return h;
|
return h;
|
||||||
if (&_my_tls != _main_tls)
|
if (IsEventSignalled (signal_arrived))
|
||||||
yield ();
|
|
||||||
else if (IsEventSignalled (signal_arrived))
|
|
||||||
{
|
{
|
||||||
set_errno (EINTR);
|
set_errno (EINTR);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -930,7 +930,7 @@ cancelable_wait (HANDLE object, DWORD timeout,
|
||||||
}
|
}
|
||||||
|
|
||||||
DWORD sig_n;
|
DWORD sig_n;
|
||||||
if (sig_wait == cw_sig_nosig || &_my_tls != _main_tls)
|
if (sig_wait == cw_sig_nosig)
|
||||||
sig_n = WAIT_TIMEOUT + 1;
|
sig_n = WAIT_TIMEOUT + 1;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue