diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2004-10-21 18:21:00 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@gcc.gnu.org> | 2004-10-21 18:21:00 +0000 |
| commit | b228bf7fd20f936d51d81a48042575f88e7e9742 (patch) | |
| tree | dcc18947be5c12c097f76186d9f8c216b46570d7 /libjava | |
| parent | ac746f1dbbf2c573671d60cc66d3d8b81c19db7a (diff) | |
| download | gcc-b228bf7fd20f936d51d81a48042575f88e7e9742.zip gcc-b228bf7fd20f936d51d81a48042575f88e7e9742.tar.gz gcc-b228bf7fd20f936d51d81a48042575f88e7e9742.tar.bz2 | |
* gnu/java/nio/channels/natFileChannelPosix.cc
(FileChannelImpl::available): Call FIONREAD ioctl with 'int *'
argument instead of 'long *'.
From-SVN: r89391
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/channels/natFileChannelPosix.cc | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 65ae5a1..3940353 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2004-10-21 Ulrich Weigand <uweigand@de.ibm.com> + + * gnu/java/nio/channels/natFileChannelPosix.cc + (FileChannelImpl::available): Call FIONREAD ioctl with 'int *' + argument instead of 'long *'. + 2004-10-21 Tom Tromey <tromey@redhat.com> * java/util/ResourceBundle.java (tryBundle): Also ignore diff --git a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc index a2c1c79..edc843b 100644 --- a/libjava/gnu/java/nio/channels/natFileChannelPosix.cc +++ b/libjava/gnu/java/nio/channels/natFileChannelPosix.cc @@ -380,7 +380,7 @@ jint FileChannelImpl::available (void) { #if defined (FIONREAD) || defined (HAVE_SELECT) || defined (HAVE_FSTAT) - long num = 0; + int num = 0; int r = 0; bool num_set = false; @@ -423,7 +423,7 @@ FileChannelImpl::available (void) && S_ISREG (sb.st_mode) && (where = lseek (fd, 0, SEEK_CUR)) != (off_t) -1) { - num = (long) (sb.st_size - where); + num = (int) (sb.st_size - where); num_set = true; } } |