From: corinna <corinna>
Date: Fri, 7 Jul 2006 15:44:19 +0000 (+0000)
Subject: 	* fhandler_socket.cc (fhandler_socket::wait): Disable SA_RESTART
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=745196b9ac6d56e0186416ad194dab5a355b009c;p=pf3gnuchains%2Fpf3gnuchains3x.git

	* fhandler_socket.cc (fhandler_socket::wait): Disable SA_RESTART
	handling for now.
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9100a0f1a5..effd5205dd 100644
--- 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 c3c24d24e5..7c6c06f992 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: