diff options
| author | Adam Megacz <adam@xwt.org> | 2002-09-16 01:44:02 +0000 |
|---|---|---|
| committer | Adam Megacz <megacz@gcc.gnu.org> | 2002-09-16 01:44:02 +0000 |
| commit | 9d43691644dc8cb490484c3a29b32340ba7605ad (patch) | |
| tree | 2c4576f5b72c66e7024ad60a00850004517b0db2 | |
| parent | 981f6289abaefa5aefb77cb6d06473c58d2e11d3 (diff) | |
| download | gcc-9d43691644dc8cb490484c3a29b32340ba7605ad.zip gcc-9d43691644dc8cb490484c3a29b32340ba7605ad.tar.gz gcc-9d43691644dc8cb490484c3a29b32340ba7605ad.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c46dec1..ebc2dbf 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 37813cb..dd3e2dd 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; |