* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50017
138bc75d-0d04-0410-961f-
82ee72b054a4
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
* win32-threads.cc (_Jv_ThreadDestroyData): _Jv_Free instead of
delete
#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
#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
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)
{
else if (retval == 0)
throw new java::io::InterruptedIOException ();
}
+#endif /* WIN32 */
retlen =
::recvfrom (fnum, (char *) dbytes, p->getLength(), 0, (sockaddr*) &u,