From: Adam Megacz <adam@xwt.org>
Date: Mon, 16 Sep 2002 01:44:02 +0000 (+0000)
Subject: natPlainSocketImpl.cc: #ifdef-shielded socket timeouts, which don't work on Win32... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d43691644dc8cb490484c3a29b32340ba7605ad;p=gcc.git

natPlainSocketImpl.cc: #ifdef-shielded socket timeouts, which don't work on Win32 (yet).

2002-09-15  Adam Megacz <adam@xwt.org>

        * java/net/natPlainSocketImpl.cc: #ifdef-shielded socket timeouts,
        which don't work on Win32 (yet).

From-SVN: r57180
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c46dec10bec..ebc2dbfc384 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-15  Adam Megacz <adam@xwt.org>
+	
+	* java/net/natPlainSocketImpl.cc: #ifdef-shielded socket timeouts,
+	which don't work on Win32 (yet).
+
 2002-09-14  Adam Megacz <adam@xwt.org>
 	
 	* java/net/natPlainDatagramSocket.cc: removed #include
diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index 37813cbcc19..dd3e2dd4c08 100644
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -357,6 +357,8 @@ java::net::PlainSocketImpl::connect (java::net::SocketAddress *addr,
   else
     throw new java::net::SocketException (JvNewStringUTF ("invalid length"));
 
+// FIXME: implement timeout support for Win32
+#ifndef WIN32
   if (timeout > 0)
     {
       int flags = ::fcntl (fnum, F_GETFL);
@@ -379,7 +381,7 @@ java::net::PlainSocketImpl::connect (java::net::SocketAddress *addr,
 	throw new java::net::SocketTimeoutException ( 
 	         JvNewStringUTF("Connect timed out"));
     }
-  else
+#endif
     {
       if (_Jv_connect (fnum, ptr, len) != 0)
         goto error;