* thread.cc (cancelable_wait): Remove test for main thread.

* fhandler_fifo.cc (fhandler_fifo::open_nonserver): Ditto.
This commit is contained in:
Corinna Vinschen 2011-05-02 18:48:11 +00:00
parent 27dd7bfbcd
commit 183ad8597c
3 changed files with 7 additions and 4 deletions

View File

@ -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>
* fhndler_tty.cc (andler_pty_master::process_slave_output): Make

View File

@ -47,9 +47,7 @@ fhandler_fifo::open_nonserver (const char *npname, unsigned low_flags,
FILE_FLAG_OVERLAPPED, NULL);
if (h != INVALID_HANDLE_VALUE || GetLastError () != ERROR_PIPE_NOT_CONNECTED)
return h;
if (&_my_tls != _main_tls)
yield ();
else if (IsEventSignalled (signal_arrived))
if (IsEventSignalled (signal_arrived))
{
set_errno (EINTR);
return NULL;

View File

@ -930,7 +930,7 @@ cancelable_wait (HANDLE object, DWORD timeout,
}
DWORD sig_n;
if (sig_wait == cw_sig_nosig || &_my_tls != _main_tls)
if (sig_wait == cw_sig_nosig)
sig_n = WAIT_TIMEOUT + 1;
else
{