From 77da08b08ea7e8b12f38605dacfc73a84be1bd82 Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Mon, 25 Feb 2002 04:10:53 +0000 Subject: natPlainDatagramSocketImpl.cc: Updated #includes for Win32... 2002-02-24 Adam Megacz * java/net/natPlainDatagramSocketImpl.cc: Updated #includes for Win32, changed #ifdefs to check WIN32 instead of the (now-obsolete) USE_WINSOCK, and removed support for socket timeouts on Win32 pending further discussion. From-SVN: r50017 --- libjava/java/net/natPlainDatagramSocketImpl.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index aedd48b..d582a53 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -8,16 +8,15 @@ details. */ #include -#ifdef USE_WINSOCK -#include -#include +#include + +make #ifdef WIN32 #include #include #ifndef ENOPROTOOPT #define ENOPROTOOPT 109 #endif -#else /* USE_WINSOCK */ -#include "posix.h" +#else /* WIN32 */ #ifdef HAVE_SYS_SOCKET_H #include #endif @@ -29,7 +28,7 @@ details. */ #endif #include #include -#endif /* USE_WINSOCK */ +#endif /* WIN32 */ #if HAVE_BSTRING_H // Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 @@ -328,6 +327,8 @@ java::net::PlainDatagramSocketImpl::receive (java::net::DatagramPacket *p) jbyte *dbytes = elements (p->getData()); ssize_t retlen = 0; +// FIXME: implement timeout support for Win32 +#ifndef WIN32 // Do timeouts via select since SO_RCVTIMEO is not always available. if (timeout > 0) { @@ -343,6 +344,7 @@ java::net::PlainDatagramSocketImpl::receive (java::net::DatagramPacket *p) else if (retval == 0) throw new java::io::InterruptedIOException (); } +#endif /* WIN32 */ retlen = ::recvfrom (fnum, (char *) dbytes, p->getLength(), 0, (sockaddr*) &u, -- cgit v1.1