diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-03-04 11:36:43 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-03-04 11:36:43 +0300 |
| commit | f317a917bc7e669a130893db5dc32a7d620662ad (patch) | |
| tree | 883b94a64b280e041f0ed56f04e62f9c3dad7e7e /winsup | |
| parent | 6b76b0c5d4cfa2ba26b33ce375f83642eb071600 (diff) | |
* fhandler_socket.cc (fhandler_socket::ioctl): Only cancel
WSAAsyncSelect when async mode is on.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 811acb965..873e11986 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2005-03-04 Pierre Humblet <pierre.humblet@ieee.org> + + * fhandler_socket.cc (fhandler_socket::ioctl): Only cancel + WSAAsyncSelect when async mode is on. + 2005-03-03 Corinna Vinschen <corinna@vinschen.de> * cygwin.din (utmpxname): Export. diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index ee93ff517..b7983a1f4 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -1594,7 +1594,7 @@ fhandler_socket::ioctl (unsigned int cmd, void *p) /* We must cancel WSAAsyncSelect (if any) before setting socket to * blocking mode */ - if (cmd == FIONBIO && *(int *) p == 0) + if (cmd == FIONBIO && async_io () && *(int *) p == 0) WSAAsyncSelect (get_socket (), winmsg, 0, 0); res = ioctlsocket (get_socket (), cmd, (unsigned long *) p); if (res == SOCKET_ERROR) |