diff options
| author | Corinna Vinschen <vinschen@redhat.com> | 2006-07-21 08:33:38 +0000 |
|---|---|---|
| committer | Corinna Vinschen <vinschen@redhat.com> | 2006-07-21 08:33:38 +0000 |
| commit | 923ca50bcd51d72c9431986ee3feaf6bbf57f7e3 (patch) | |
| tree | 814249064b45b0421b07177eb7402b1b6bf418ac | |
| parent | dadb0b6b7f732c64f203713f84b87ec36d94165e (diff) | |
| download | gdb-923ca50bcd51d72c9431986ee3feaf6bbf57f7e3.tar.gz | |
* fhandler_socket.cc (fhandler_socket::wait): Set Winsock errno to
WSAEWOULDBLOCK instead of WSAEINPROGRESS.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 89893fdc5da..3284601ff99 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2006-07-20 Corinna Vinschen <corinna@vinschen.de> + + * fhandler_socket.cc (fhandler_socket::wait): Set Winsock errno to + WSAEWOULDBLOCK instead of WSAEINPROGRESS. + 2006-07-19 Corinna Vinschen <corinna@vinschen.de> * pinfo.cc (commune_process): Don't add extra \0 to cmdline. diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index ba795ce8a6c..50b312f373c 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -567,14 +567,14 @@ sa_restart: if (!events) { if (is_nonblocking ()) - WSASetLastError (WSAEINPROGRESS); + WSASetLastError (WSAEWOULDBLOCK); else { WSAEVENT ev[2] = { wsock_evt, signal_arrived }; switch (WSAWaitForMultipleEvents (2, ev, FALSE, INFINITE, FALSE)) { case WSA_WAIT_TIMEOUT: - WSASetLastError (WSAEINPROGRESS); + WSASetLastError (WSAEWOULDBLOCK); break; case WSA_WAIT_EVENT_0: goto sa_restart; |