From e7b77aaecdad1f1c99e45f10f4d5d5ffadeb3e40 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 7 Jul 2006 15:44:19 +0000 Subject: [PATCH] * fhandler_socket.cc (fhandler_socket::wait): Disable SA_RESTART handling for now. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler_socket.cc | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9100a0f1a..effd5205d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2006-07-07 Corinna Vinschen + + * fhandler_socket.cc (fhandler_socket::wait): Disable SA_RESTART + handling for now. + 2006-07-07 Corinna Vinschen * Makefile.in (DLL_OFILES): Add inet_addr.o and inet_network.o. diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index c3c24d24e..7c6c06f99 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -970,9 +970,11 @@ fhandler_socket::wait (HANDLE event, int flags, DWORD timeout) WSAEVENT ev[2] = { event, signal_arrived }; WSANETWORKEVENTS evts; +#if 0 /* Not yet. Not this way. */ /* If WSAWaitForMultipleEvents is interrupted by a signal, and the signal has the SA_RESTART flag set, return to this label and... restart. */ sa_restart: +#endif switch (WSAWaitForMultipleEvents (2, ev, FALSE, timeout, FALSE)) { @@ -1044,11 +1046,13 @@ sa_restart: } break; case WSA_WAIT_EVENT_0 + 1: +#if 0 /* Not yet. Not this way. */ if (_my_tls.call_signal_handler ()) { sig_dispatch_pending (); goto sa_restart; } +#endif WSASetLastError (WSAEINTR); break; default: