natPlainDatagramSocketImpl.cc: Updated #includes for Win32...

2002-02-24  Adam Megacz  <adam@xwt.org>

	* 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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c20386a96a143388f229e090a678e70025d0b476..9e7044b6648b56fccd0118f49b229ed78b1fd029 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-24  Adam Megacz  <adam@xwt.org>
+
+       * 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.
+
 2002-02-24  Adam Megacz  <adam@xwt.org>
 
        * win32-threads.cc (_Jv_ThreadInitData): _Jv_Malloc instead of new

diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc
index aedd48bbbdde844fe55e406771f3e88aed75c899..d582a532722825127d5a7be5eaf8173a1173b03a 100644 (file)
--- a/libjava/java/net/natPlainDatagramSocketImpl.cc
+++ b/libjava/java/net/natPlainDatagramSocketImpl.cc
@@ -8,16 +8,15 @@ details.  */
 
 #include <config.h>
 
-#ifdef USE_WINSOCK
-#include <windows.h>
-#include <winsock.h>
+#include<platform.h>
+
+make #ifdef WIN32
 #include <errno.h>
 #include <string.h>
 #ifndef ENOPROTOOPT
 #define ENOPROTOOPT 109
 #endif
-#else /* USE_WINSOCK */
-#include "posix.h"
+#else /* WIN32 */
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -29,7 +28,7 @@ details.  */
 #endif
 #include <errno.h>
 #include <string.h>
-#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,