aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2003-03-03 14:36:48 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2003-03-03 14:36:48 +0000
commit0d4de51defe172a09205933c74af23b69b526dd1 (patch)
treeb6801779dda4c4ac8525b68e8234c299412d41be /libjava
parent426ace7fb55f5c34754af6dd6c10efb690f5bb9c (diff)
downloadgcc-0d4de51defe172a09205933c74af23b69b526dd1.zip
gcc-0d4de51defe172a09205933c74af23b69b526dd1.tar.gz
gcc-0d4de51defe172a09205933c74af23b69b526dd1.tar.bz2
2003-03-03 Michael Koch <konqueror@gmx.de>
* Makefile.am (ordinary_java_source_files): Added gnu/java/nio/MappedByteFileBuffer.java. (nat_source_files): Added gnu/java/nio/natMappedByteFileBuffer.cc. * Makefile.in: Regenerated. From-SVN: r63721
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog9
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in22
3 files changed, 24 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9c55675..aaa9512 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,14 @@
2003-03-03 Michael Koch <konqueror@gmx.de>
+ * Makefile.am
+ (ordinary_java_source_files):
+ Added gnu/java/nio/MappedByteFileBuffer.java.
+ (nat_source_files):
+ Added gnu/java/nio/natMappedByteFileBuffer.cc.
+ * Makefile.in: Regenerated.
+
+2003-03-03 Michael Koch <konqueror@gmx.de>
+
* java/net/DatagramSocket.java
(connect): Merged comment from classpath.
(receive): Merged documentation from classpath.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index e5f849f..3ed46f4 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -2073,6 +2073,7 @@ gnu/java/nio/FileChannelImpl.java \
gnu/java/nio/FloatBufferImpl.java \
gnu/java/nio/IntBufferImpl.java \
gnu/java/nio/LongBufferImpl.java \
+gnu/java/nio/MappedByteFileBuffer.java \
gnu/java/nio/PipeImpl.java \
gnu/java/nio/SelectionKeyImpl.java \
gnu/java/nio/SelectorImpl.java \
@@ -2493,6 +2494,7 @@ gnu/java/nio/natFileChannelImpl.cc \
gnu/java/nio/natFloatBufferImpl.cc \
gnu/java/nio/natIntBufferImpl.cc \
gnu/java/nio/natLongBufferImpl.cc \
+gnu/java/nio/natMappedByteFileBuffer.cc \
gnu/java/nio/natSelectorImpl.cc \
gnu/java/nio/natShortBufferImpl.cc \
gnu/java/nio/natSocketChannelImpl.cc \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 589605c..67ef3a6 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1834,6 +1834,7 @@ gnu/java/nio/FileChannelImpl.java \
gnu/java/nio/FloatBufferImpl.java \
gnu/java/nio/IntBufferImpl.java \
gnu/java/nio/LongBufferImpl.java \
+gnu/java/nio/MappedByteFileBuffer.java \
gnu/java/nio/PipeImpl.java \
gnu/java/nio/SelectionKeyImpl.java \
gnu/java/nio/SelectorImpl.java \
@@ -2253,6 +2254,7 @@ gnu/java/nio/natFileChannelImpl.cc \
gnu/java/nio/natFloatBufferImpl.cc \
gnu/java/nio/natIntBufferImpl.cc \
gnu/java/nio/natLongBufferImpl.cc \
+gnu/java/nio/natMappedByteFileBuffer.cc \
gnu/java/nio/natSelectorImpl.cc \
gnu/java/nio/natShortBufferImpl.cc \
gnu/java/nio/natSocketChannelImpl.cc \
@@ -2430,14 +2432,14 @@ gnu/gcj/runtime/natVMClassLoader.lo gnu/java/nio/natByteBufferImpl.lo \
gnu/java/nio/natCharBufferImpl.lo gnu/java/nio/natDoubleBufferImpl.lo \
gnu/java/nio/natFileChannelImpl.lo gnu/java/nio/natFloatBufferImpl.lo \
gnu/java/nio/natIntBufferImpl.lo gnu/java/nio/natLongBufferImpl.lo \
-gnu/java/nio/natSelectorImpl.lo gnu/java/nio/natShortBufferImpl.lo \
-gnu/java/nio/natSocketChannelImpl.lo java/io/natFile.lo \
-java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \
-java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
-java/lang/natClass.lo java/lang/natClassLoader.lo \
-java/lang/natConcreteProcess.lo java/lang/natDouble.lo \
-java/lang/natFloat.lo java/lang/natMath.lo java/lang/natObject.lo \
-java/lang/natRuntime.lo java/lang/natString.lo \
+gnu/java/nio/natMappedByteFileBuffer.lo gnu/java/nio/natSelectorImpl.lo \
+gnu/java/nio/natShortBufferImpl.lo gnu/java/nio/natSocketChannelImpl.lo \
+java/io/natFile.lo java/io/natFileDescriptor.lo \
+java/io/natObjectInputStream.lo java/io/natVMObjectStreamClass.lo \
+java/lang/natCharacter.lo java/lang/natClass.lo \
+java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
+java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \
+java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.lo \
java/lang/natStringBuffer.lo java/lang/natSystem.lo \
java/lang/natThread.lo java/lang/natVMSecurityManager.lo \
java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
@@ -2896,7 +2898,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/gnu/java/nio/DoubleBufferImpl.P \
.deps/gnu/java/nio/FileChannelImpl.P \
.deps/gnu/java/nio/FloatBufferImpl.P .deps/gnu/java/nio/IntBufferImpl.P \
-.deps/gnu/java/nio/LongBufferImpl.P .deps/gnu/java/nio/PipeImpl.P \
+.deps/gnu/java/nio/LongBufferImpl.P \
+.deps/gnu/java/nio/MappedByteFileBuffer.P .deps/gnu/java/nio/PipeImpl.P \
.deps/gnu/java/nio/SelectionKeyImpl.P .deps/gnu/java/nio/SelectorImpl.P \
.deps/gnu/java/nio/SelectorProviderImpl.P \
.deps/gnu/java/nio/ServerSocketChannelImpl.P \
@@ -2918,6 +2921,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/gnu/java/nio/natFloatBufferImpl.P \
.deps/gnu/java/nio/natIntBufferImpl.P \
.deps/gnu/java/nio/natLongBufferImpl.P \
+.deps/gnu/java/nio/natMappedByteFileBuffer.P \
.deps/gnu/java/nio/natSelectorImpl.P \
.deps/gnu/java/nio/natShortBufferImpl.P \
.deps/gnu/java/nio/natSocketChannelImpl.P \