summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorgary <gary@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-17 17:02:48 +0000
committergary <gary@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-17 17:02:48 +0000
commit760960a544d20804497eb85def4145fe3c28f497 (patch)
tree57286e962c230eece4a4f8fa770be5e8d9d9e39f /libjava
parent50e5c6635ceb54c8e1673af2a883dca3557ca7bf (diff)
downloadgcc-760960a544d20804497eb85def4145fe3c28f497.tar.gz
2007-01-17 Gary Benson <gbenson@redhat.com>
* java/nio/natVMDirectByteBufferImpl.cc: Renamed from java/nio/natDirectByteBufferImpl.cc. * Makefile.am: Reflect the above. * Makefile.in: Rebuilt. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120859 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog7
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in14
-rw-r--r--libjava/java/nio/natVMDirectByteBufferImpl.cc (renamed from libjava/java/nio/natDirectByteBufferImpl.cc)0
4 files changed, 15 insertions, 8 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e2ba835c48f..64bdf4b9355 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-17 Gary Benson <gbenson@redhat.com>
+
+ * java/nio/natVMDirectByteBufferImpl.cc:
+ Renamed from java/nio/natDirectByteBufferImpl.cc.
+ * Makefile.am: Reflect the above.
+ * Makefile.in: Rebuilt.
+
2007-01-17 Marco Trudel <mtrudel@gmx.ch>
* jvmti.cc (_Jv_JVMTI_GetAllThreads): Now static. Use JNICALL.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index a8b2fffc255..d95dc344638 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -871,7 +871,7 @@ java/net/natVMInetAddress.cc \
java/net/natVMNetworkInterface.cc \
java/net/natVMURLConnection.cc \
java/nio/channels/natVMChannels.cc \
-java/nio/natDirectByteBufferImpl.cc \
+java/nio/natVMDirectByteBufferImpl.cc \
java/security/natVMAccessController.cc \
java/security/natVMAccessControlState.cc \
java/text/natCollator.cc \
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 78013d50100..b27d0809688 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -329,7 +329,7 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \
java/net/natVMNetworkInterface.cc \
java/net/natVMURLConnection.cc \
java/nio/channels/natVMChannels.cc \
- java/nio/natDirectByteBufferImpl.cc \
+ java/nio/natVMDirectByteBufferImpl.cc \
java/security/natVMAccessController.cc \
java/security/natVMAccessControlState.cc \
java/text/natCollator.cc java/util/natVMTimeZone.cc \
@@ -392,7 +392,7 @@ am__objects_2 = gnu/classpath/jdwp/natVMFrame.lo \
java/net/natVMNetworkInterface.lo \
java/net/natVMURLConnection.lo \
java/nio/channels/natVMChannels.lo \
- java/nio/natDirectByteBufferImpl.lo \
+ java/nio/natVMDirectByteBufferImpl.lo \
java/security/natVMAccessController.lo \
java/security/natVMAccessControlState.lo \
java/text/natCollator.lo java/util/natVMTimeZone.lo \
@@ -7955,7 +7955,7 @@ java/net/natVMInetAddress.cc \
java/net/natVMNetworkInterface.cc \
java/net/natVMURLConnection.cc \
java/nio/channels/natVMChannels.cc \
-java/nio/natDirectByteBufferImpl.cc \
+java/nio/natVMDirectByteBufferImpl.cc \
java/security/natVMAccessController.cc \
java/security/natVMAccessControlState.cc \
java/text/natCollator.cc \
@@ -8513,7 +8513,7 @@ java/nio/$(am__dirstamp):
java/nio/$(DEPDIR)/$(am__dirstamp):
@$(mkdir_p) java/nio/$(DEPDIR)
@: > java/nio/$(DEPDIR)/$(am__dirstamp)
-java/nio/natDirectByteBufferImpl.lo: java/nio/$(am__dirstamp) \
+java/nio/natVMDirectByteBufferImpl.lo: java/nio/$(am__dirstamp) \
java/nio/$(DEPDIR)/$(am__dirstamp)
java/security/$(am__dirstamp):
@$(mkdir_p) java/security
@@ -8924,8 +8924,8 @@ mostlyclean-compile:
-rm -f java/net/natVMURLConnection.lo
-rm -f java/nio/channels/natVMChannels.$(OBJEXT)
-rm -f java/nio/channels/natVMChannels.lo
- -rm -f java/nio/natDirectByteBufferImpl.$(OBJEXT)
- -rm -f java/nio/natDirectByteBufferImpl.lo
+ -rm -f java/nio/natVMDirectByteBufferImpl.$(OBJEXT)
+ -rm -f java/nio/natVMDirectByteBufferImpl.lo
-rm -f java/security/natVMAccessControlState.$(OBJEXT)
-rm -f java/security/natVMAccessControlState.lo
-rm -f java/security/natVMAccessController.$(OBJEXT)
@@ -9063,7 +9063,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMInetAddress.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMNetworkInterface.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/net/$(DEPDIR)/natVMURLConnection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/nio/$(DEPDIR)/natDirectByteBufferImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/nio/$(DEPDIR)/natVMDirectByteBufferImpl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/nio/channels/$(DEPDIR)/natVMChannels.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/security/$(DEPDIR)/natVMAccessControlState.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@java/security/$(DEPDIR)/natVMAccessController.Plo@am__quote@
diff --git a/libjava/java/nio/natDirectByteBufferImpl.cc b/libjava/java/nio/natVMDirectByteBufferImpl.cc
index 3119fdea3e6..3119fdea3e6 100644
--- a/libjava/java/nio/natDirectByteBufferImpl.cc
+++ b/libjava/java/nio/natVMDirectByteBufferImpl.cc