diff options
| author | Tom Tromey <tromey@cygnus.com> | 2000-08-02 21:54:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2000-08-02 21:54:04 +0000 |
| commit | f536cd95fb5cfbfa54809514fd89dc55d6b8e1a4 (patch) | |
| tree | 03fe690813ad84c550ddb18c4058221d6290e55a /libjava/java/io | |
| parent | 2d579116788c2841ace42c93fe35bef5cf263543 (diff) | |
| download | gcc-f536cd95fb5cfbfa54809514fd89dc55d6b8e1a4.zip gcc-f536cd95fb5cfbfa54809514fd89dc55d6b8e1a4.tar.gz gcc-f536cd95fb5cfbfa54809514fd89dc55d6b8e1a4.tar.bz2 | |
Makefile.in: Rebuilt.
* 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.
From-SVN: r35435
Diffstat (limited to 'libjava/java/io')
| -rw-r--r-- | libjava/java/io/natFileDescriptorPosix.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc index 6e06a03..059eeb9 100644 --- a/libjava/java/io/natFileDescriptorPosix.cc +++ b/libjava/java/io/natFileDescriptorPosix.cc @@ -10,16 +10,11 @@ details. */ #include <config.h> -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif +#include "posix.h" + #include <errno.h> #include <stdio.h> #include <string.h> -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif -#include <sys/types.h> #include <sys/stat.h> #include <sys/param.h> #include <fcntl.h> @@ -309,7 +304,7 @@ java::io::FileDescriptor::available (void) struct timeval tv; tv.tv_sec = 0; tv.tv_usec = 0; - r = ::select (fd + 1, &rd, NULL, NULL, &tv); + r = _Jv_select (fd + 1, &rd, NULL, NULL, &tv); if (r == -1) goto posix_error; num = r == 0 ? 0 : 1; |