diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-02 21:54:04 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-02 21:54:04 +0000 |
| commit | 8e7328b6e0cc88f98dc25570d244833add8c296b (patch) | |
| tree | 03fe690813ad84c550ddb18c4058221d6290e55a /libjava/java/net | |
| parent | 7559fcc7808b8568071c82e0d494fc297ac613ad (diff) | |
| download | ppe42-gcc-8e7328b6e0cc88f98dc25570d244833add8c296b.tar.gz ppe42-gcc-8e7328b6e0cc88f98dc25570d244833add8c296b.zip | |
* Makefile.in: Rebuilt.
* Makefile.am (libgcj_la_SOURCES): Added posix.cc.
* java/net/natPlainSocketImpl.cc: Include posix.h.
(accept): Use _Jv_select.
* java/net/natPlainDatagramSocketImpl.cc: Include posix.h.
(receive): Use _Jv_select.
* java/io/natFileDescriptorPosix.cc: Include posix.h.
(available): Use _Jv_select.
* java/lang/natSystem.cc: Include posix.h.
(currentTimeMillis): Use _Jv_gettimeofday.
* include/posix.h: New file.
* posix.cc: New file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35435 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/net')
| -rw-r--r-- | libjava/java/net/natPlainDatagramSocketImpl.cc | 10 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 10 |
2 files changed, 5 insertions, 15 deletions
diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index 94383f8309d..fe83b1053f6 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -17,16 +17,10 @@ details. */ #define ENOPROTOOPT 109 #endif #else /* USE_WINSOCK */ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif +#include "posix.h" #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif -#include <sys/time.h> -#ifdef HAVE_SYS_SELECT_H -#include <sys/select.h> -#endif #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif @@ -314,7 +308,7 @@ java::net::PlainDatagramSocketImpl::receive (java::net::DatagramPacket *p) tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout % 1000) * 1000; int retval; - if ((retval = select (fnum + 1, &rset, NULL, NULL, &tv)) < 0) + if ((retval = _Jv_select (fnum + 1, &rset, NULL, NULL, &tv)) < 0) goto error; else if (retval == 0) JvThrow (new java::io::InterruptedIOException ()); diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index 52187461f49..18fd74ba447 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000 Free Software Foundation This file is part of libgcj. @@ -19,12 +19,8 @@ details. */ #define ENOPROTOOPT 109 #endif #else /* USE_WINSOCK */ -#include <sys/types.h> +#include "posix.h" #include <sys/socket.h> -#include <sys/time.h> -#ifdef HAVE_SYS_SELECT_H -#include <sys/select.h> -#endif #include <netinet/in.h> #include <netinet/tcp.h> #include <errno.h> @@ -249,7 +245,7 @@ java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *s) tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout % 1000) * 1000; int retval; - if ((retval = select (fnum + 1, &rset, NULL, NULL, &tv)) < 0) + if ((retval = _Jv_select (fnum + 1, &rset, NULL, NULL, &tv)) < 0) goto error; else if (retval == 0) JvThrow (new java::io::InterruptedIOException ( |
