diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e60be8d38..819b9b21c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-01  Corinna Vinschen  <corinna@vinschen.de>
+
+	* net.cc (wsock_event::wait): Make wsa_err an int.  Don't set
+	ret to 0 if any error has happened.
+
 2004-04-01  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_socket.cc (fhandler_socket::sendto): Drop out of loop if
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index 2459580b5..4f8ee3d12 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -69,7 +69,7 @@ int
 wsock_event::wait (int sock, int &closed)
 {
   int ret = SOCKET_ERROR;
-  DWORD wsa_err = 0;
+  int wsa_err = 0;
   WSAEVENT ev[2] = { event, signal_arrived };
   switch (WSAWaitForMultipleEvents (2, ev, FALSE, WSA_INFINITE, FALSE))
     {
@@ -94,10 +94,13 @@ wsock_event::wait (int sock, int &closed)
 	    if (evts.lNetworkEvents & FD_CLOSE)
 	      {
 		closed = 1;
-		if (!wsa_err && evts.iErrorCode[FD_CLOSE_BIT])
-		  wsa_err = evts.iErrorCode[FD_CLOSE_BIT];
-		else
-		  ret = 0;
+		if (!wsa_err)
+		  {
+		    if (evts.iErrorCode[FD_CLOSE_BIT])
+		      wsa_err = evts.iErrorCode[FD_CLOSE_BIT];
+		    else
+		      ret = 0;
+		  }
 	      }
 	    if (wsa_err)
 	      WSASetLastError (wsa_err);