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

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 c46dec10becf1ade36649115569728dbecefd89c..ebc2dbfc384cde22901228b138b90fe2bd32f9b3 100644 (file)
--- 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 37813cbcc19ee64fac77219286e579ea2b41662e..dd3e2dd4c087dc28a64fe88c6dda0ec17dc69380 100644 (file)
--- 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;