* fhandler_socket.cc (fhandler_socket::wait): Disable SA_RESTART

	handling for now.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9100a0f..effd520 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-07  Corinna Vinschen  <corinna@vinschen.de>
 
+       * fhandler_socket.cc (fhandler_socket::wait): Disable SA_RESTART
+       handling for now.
+
+2006-07-07  Corinna Vinschen  <corinna@vinschen.de>
+
        * Makefile.in (DLL_OFILES): Add inet_addr.o and inet_network.o.
        * autoload.cc (inet_addr): Drop definition.
        (inet_ntoa): Ditto.

diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index c3c24d2..7c6c06f 100644 (file)
--- 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: