diff options
| author | Michael Koch <konqueror@gmx.de> | 2003-06-19 09:33:58 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-06-19 09:33:58 +0000 |
| commit | b7a793afb7b72ed72f4c083b376abba287d63a76 (patch) | |
| tree | a26da0f65a0e152594363a271ca47abd31c9d6be /libjava | |
| parent | 16e4b777c8391192e3cd53ba549ccc023b07409a (diff) | |
| download | gcc-b7a793afb7b72ed72f4c083b376abba287d63a76.zip gcc-b7a793afb7b72ed72f4c083b376abba287d63a76.tar.gz gcc-b7a793afb7b72ed72f4c083b376abba287d63a76.tar.bz2 | |
2003-06-19 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/FileChannelImpl.java
(map_address): Made public.
(FileChannelImpl): Merged with classpath.
* gnu/java/nio/natFileChannelImpl.cc
(nio_mmap_file): Commented out unused arguments.
(nio_unmmap_file): Likewise.
(niu_msync): Likewise.
From-SVN: r68186
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 10 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/FileChannelImpl.java | 4 | ||||
| -rw-r--r-- | libjava/gnu/java/nio/natFileChannelImpl.cc | 8 |
3 files changed, 17 insertions, 5 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index eccedbc..e2a6eca 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,15 @@ 2003-06-19 Michael Koch <konqueror@gmx.de> + * gnu/java/nio/FileChannelImpl.java + (map_address): Made public. + (FileChannelImpl): Merged with classpath. + * gnu/java/nio/natFileChannelImpl.cc + (nio_mmap_file): Commented out unused arguments. + (nio_unmmap_file): Likewise. + (niu_msync): Likewise. + +2003-06-19 Michael Koch <konqueror@gmx.de> + * java/awt/image/IndexColorModel.java: New version from classpath. diff --git a/libjava/gnu/java/nio/FileChannelImpl.java b/libjava/gnu/java/nio/FileChannelImpl.java index cedf397..392f479 100644 --- a/libjava/gnu/java/nio/FileChannelImpl.java +++ b/libjava/gnu/java/nio/FileChannelImpl.java @@ -65,7 +65,7 @@ import gnu.gcj.RawData; public class FileChannelImpl extends FileChannel { - RawData map_address; + public RawData map_address; int length; FileDescriptor fd; @@ -85,7 +85,7 @@ public class FileChannelImpl extends FileChannel public FileChannelImpl () { - this (new FileDescriptor (-1), true, null); + this (new FileDescriptor (), true, null); } private native long implPosition (); diff --git a/libjava/gnu/java/nio/natFileChannelImpl.cc b/libjava/gnu/java/nio/natFileChannelImpl.cc index 0bc0919..6119775 100644 --- a/libjava/gnu/java/nio/natFileChannelImpl.cc +++ b/libjava/gnu/java/nio/natFileChannelImpl.cc @@ -73,20 +73,22 @@ gnu::java::nio::FileChannelImpl::implTruncate (jlong size) } gnu::gcj::RawData* -gnu::java::nio::FileChannelImpl::nio_mmap_file (jlong pos, jlong size, +gnu::java::nio::FileChannelImpl::nio_mmap_file (jlong /*pos*/, jlong /*size*/, jint /*mode*/) { throw new ::java::io::IOException (JvNewStringUTF ("mmap not implemented")); } void -gnu::java::nio::FileChannelImpl::nio_unmmap_file (gnu::gcj::RawData* map_address, jint size) +gnu::java::nio::FileChannelImpl::nio_unmmap_file (gnu::gcj::RawData* /*address*/, + jint /*size*/) { throw new ::java::io::IOException (JvNewStringUTF ("munmap not implemented")); } void -gnu::java::nio::FileChannelImpl::nio_msync (gnu::gcj::RawData* map_address, jint length) +gnu::java::nio::FileChannelImpl::nio_msync (gnu::gcj::RawData* /*map_address*/, + jint /*length*/) { throw new ::java::io::IOException (JvNewStringUTF ("msync not implemented")); } |