diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-06 23:23:34 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-06 23:23:34 +0000 |
| commit | 15ac4c922ade47d149ffd87c8431c50b2cd50d5d (patch) | |
| tree | 26da2a384ceaf3a758cc43d068cc7a6780786eff /libjava/java | |
| parent | 365489b26364cf32f8a583c4727430c5b91c1004 (diff) | |
| download | ppe42-gcc-15ac4c922ade47d149ffd87c8431c50b2cd50d5d.tar.gz ppe42-gcc-15ac4c922ade47d149ffd87c8431c50b2cd50d5d.zip | |
* java/io/natFileDescriptorEcos.cc (init): Don't use
GetStdHandle.
* java/io/natFileDescriptorPosix.cc (valid): Don't call stat if FD
is negative.
(init): Don't use GetStdHandle.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50383 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/io/natFileDescriptorEcos.cc | 8 | ||||
| -rw-r--r-- | libjava/java/io/natFileDescriptorPosix.cc | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libjava/java/io/natFileDescriptorEcos.cc b/libjava/java/io/natFileDescriptorEcos.cc index 81e10e2e559..8e1dd950b8f 100644 --- a/libjava/java/io/natFileDescriptorEcos.cc +++ b/libjava/java/io/natFileDescriptorEcos.cc @@ -1,6 +1,6 @@ // natFileDescriptor.cc - Native part of FileDescriptor class. -/* Copyright (C) 1998, 1999, 2001 Free Software Foundation +/* Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation This file is part of libgcj. @@ -44,9 +44,9 @@ diag_write (char *data, int len) void java::io::FileDescriptor::init(void) { - in = new java::io::FileDescriptor((jint)(GetStdHandle (0))); - out = new java::io::FileDescriptor((jint)(GetStdHandle (1))); - err = new java::io::FileDescriptor((jint)(GetStdHandle (2))); + in = new java::io::FileDescriptor(0); + out = new java::io::FileDescriptor(1); + err = new java::io::FileDescriptor(2); } jboolean diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc index 83a1261de0d..5352f99cc63 100644 --- a/libjava/java/io/natFileDescriptorPosix.cc +++ b/libjava/java/io/natFileDescriptorPosix.cc @@ -1,6 +1,6 @@ // natFileDescriptor.cc - Native part of FileDescriptor class. -/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation This file is part of libgcj. @@ -46,18 +46,18 @@ details. */ #define NO_FSYNC_MESSAGE "sync unsupported" void -java::io::FileDescriptor::init(void) +java::io::FileDescriptor::init (void) { - in = new java::io::FileDescriptor((jint)(GetStdHandle (0))); - out = new java::io::FileDescriptor((jint)(GetStdHandle (1))); - err = new java::io::FileDescriptor((jint)(GetStdHandle (2))); + in = new java::io::FileDescriptor(0); + out = new java::io::FileDescriptor(1); + err = new java::io::FileDescriptor(2); } jboolean java::io::FileDescriptor::valid (void) { struct stat sb; - return ::fstat (fd, &sb) == 0; + return fd >= 0 && ::fstat (fd, &sb) == 0; } void |
