aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/lang
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java/lang')
-rw-r--r--libjava/java/lang/Class.h2
-rw-r--r--libjava/java/lang/Object.h5
-rw-r--r--libjava/java/lang/natCharacter.cc2
-rw-r--r--libjava/java/lang/natClass.cc2
-rw-r--r--libjava/java/lang/natClassLoader.cc8
-rw-r--r--libjava/java/lang/natDouble.cc2
-rw-r--r--libjava/java/lang/natEcosProcess.cc2
-rw-r--r--libjava/java/lang/natFirstThread.cc2
-rw-r--r--libjava/java/lang/natMath.cc2
-rw-r--r--libjava/java/lang/natObject.cc2
-rw-r--r--libjava/java/lang/natPosixProcess.cc2
-rw-r--r--libjava/java/lang/natRuntime.cc2
-rw-r--r--libjava/java/lang/natString.cc2
-rw-r--r--libjava/java/lang/natSystem.cc2
-rw-r--r--libjava/java/lang/natThread.cc4
-rw-r--r--libjava/java/lang/reflect/natArray.cc2
-rw-r--r--libjava/java/lang/reflect/natField.cc2
-rw-r--r--libjava/java/lang/reflect/natMethod.cc5
18 files changed, 24 insertions, 26 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h
index b3a8666..c88c86e 100644
--- a/libjava/java/lang/Class.h
+++ b/libjava/java/lang/Class.h
@@ -18,7 +18,7 @@ details. */
#include <java/lang/String.h>
#include <java/net/URL.h>
-// We declare these here to avoid including cni.h.
+// We declare these here to avoid including gcj/cni.h.
extern "C" void _Jv_InitClass (jclass klass);
extern "C" void _Jv_RegisterClasses (jclass *classes);
diff --git a/libjava/java/lang/Object.h b/libjava/java/lang/Object.h
index c5d55f1..971ba68 100644
--- a/libjava/java/lang/Object.h
+++ b/libjava/java/lang/Object.h
@@ -13,10 +13,7 @@ details. */
#pragma interface
-#include <javaprims.h>
-#include <java-assert.h>
-#include <java-threads.h>
-#include <java-gc.h>
+#include <gcj/javaprims.h>
// This class is mainly here as a kludge to get G++ to allocate
// vtable pointer as the *first* word of each Object, instead of
diff --git a/libjava/java/lang/natCharacter.cc b/libjava/java/lang/natCharacter.cc
index fa312d1..4eca4a4 100644
--- a/libjava/java/lang/natCharacter.cc
+++ b/libjava/java/lang/natCharacter.cc
@@ -10,7 +10,7 @@ details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Character.h>
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 2a8bb3b..f7c598d 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -15,7 +15,7 @@ details. */
#pragma implementation "Class.h"
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Class.h>
#include <java/lang/ClassLoader.h>
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index c0d06d4..9ad81a8 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -15,8 +15,12 @@ details. */
#include <stdlib.h>
#include <string.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
+
+#include <java-threads.h>
+#include <java-interp.h>
+
#include <java/lang/Character.h>
#include <java/lang/Thread.h>
#include <java/lang/ClassLoader.h>
@@ -31,8 +35,6 @@ details. */
#include <java/lang/IncompatibleClassChangeError.h>
#include <java/lang/reflect/Modifier.h>
-#include <java-interp.h>
-
#define CloneableClass _CL_Q34java4lang9Cloneable
extern java::lang::Class CloneableClass;
#define ObjectClass _CL_Q34java4lang6Object
diff --git a/libjava/java/lang/natDouble.cc b/libjava/java/lang/natDouble.cc
index 8d8c788..87466a8 100644
--- a/libjava/java/lang/natDouble.cc
+++ b/libjava/java/lang/natDouble.cc
@@ -25,7 +25,7 @@ char *alloca ();
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/lang/String.h>
#include <java/lang/Double.h>
#include <java/lang/NumberFormatException.h>
diff --git a/libjava/java/lang/natEcosProcess.cc b/libjava/java/lang/natEcosProcess.cc
index 774a697..c9d4dbd 100644
--- a/libjava/java/lang/natEcosProcess.cc
+++ b/libjava/java/lang/natEcosProcess.cc
@@ -14,7 +14,7 @@ details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/ConcreteProcess.h>
diff --git a/libjava/java/lang/natFirstThread.cc b/libjava/java/lang/natFirstThread.cc
index 319e487..031779e 100644
--- a/libjava/java/lang/natFirstThread.cc
+++ b/libjava/java/lang/natFirstThread.cc
@@ -12,7 +12,7 @@ details. */
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/FirstThread.h>
diff --git a/libjava/java/lang/natMath.cc b/libjava/java/lang/natMath.cc
index 6638247..bdfc9f9 100644
--- a/libjava/java/lang/natMath.cc
+++ b/libjava/java/lang/natMath.cc
@@ -23,7 +23,7 @@ details. */
#include <java/lang/Integer.h>
#include <java/lang/Long.h>
#include <java/lang/Math.h>
-#include <java-array.h>
+#include <gcj/array.h>
#include "fdlibm.h"
diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc
index 1d9a490..22632c5 100644
--- a/libjava/java/lang/natObject.cc
+++ b/libjava/java/lang/natObject.cc
@@ -14,7 +14,7 @@ details. */
#pragma implementation "Object.h"
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Object.h>
#include <java-threads.h>
diff --git a/libjava/java/lang/natPosixProcess.cc b/libjava/java/lang/natPosixProcess.cc
index 5c6d9a7..9fa7d33 100644
--- a/libjava/java/lang/natPosixProcess.cc
+++ b/libjava/java/lang/natPosixProcess.cc
@@ -22,7 +22,7 @@ details. */
#include <stdlib.h>
#include <stdio.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/ConcreteProcess.h>
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index f8b050c..ec1d402 100644
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -12,7 +12,7 @@ details. */
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/Runtime.h>
#include <java/lang/UnknownError.h>
diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc
index bfdc50f..53bda1f 100644
--- a/libjava/java/lang/natString.cc
+++ b/libjava/java/lang/natString.cc
@@ -13,7 +13,7 @@ details. */
#include <string.h>
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/lang/Character.h>
#include <java/lang/String.h>
#include <java/lang/IndexOutOfBoundsException.h>
diff --git a/libjava/java/lang/natSystem.cc b/libjava/java/lang/natSystem.cc
index 5c2a80e..f453de0 100644
--- a/libjava/java/lang/natSystem.cc
+++ b/libjava/java/lang/natSystem.cc
@@ -38,7 +38,7 @@ details. */
#include <sys/utsname.h>
#endif
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
#include <java/lang/System.h>
#include <java/lang/Class.h>
diff --git a/libjava/java/lang/natThread.cc b/libjava/java/lang/natThread.cc
index 50db564..c9d115c 100644
--- a/libjava/java/lang/natThread.cc
+++ b/libjava/java/lang/natThread.cc
@@ -12,8 +12,10 @@ details. */
#include <stdlib.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
+#include <java-threads.h>
+
#include <java/lang/Thread.h>
#include <java/lang/ThreadGroup.h>
#include <java/lang/IllegalArgumentException.h>
diff --git a/libjava/java/lang/reflect/natArray.cc b/libjava/java/lang/reflect/natArray.cc
index 2c951db..88e8091 100644
--- a/libjava/java/lang/reflect/natArray.cc
+++ b/libjava/java/lang/reflect/natArray.cc
@@ -13,7 +13,7 @@ details. */
#include <stdlib.h>
#include <jvm.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <java/lang/reflect/Array.h>
#include <java/lang/IllegalArgumentException.h>
#include <java/lang/Byte.h>
diff --git a/libjava/java/lang/reflect/natField.cc b/libjava/java/lang/reflect/natField.cc
index 2449b42..0494532 100644
--- a/libjava/java/lang/reflect/natField.cc
+++ b/libjava/java/lang/reflect/natField.cc
@@ -12,7 +12,6 @@ details. */
#include <stdlib.h>
-#include <cni.h>
#include <jvm.h>
#include <java/lang/reflect/Field.h>
#include <java/lang/reflect/Modifier.h>
@@ -26,7 +25,6 @@ details. */
#include <java/lang/Double.h>
#include <java/lang/Boolean.h>
#include <java/lang/Character.h>
-#include <java-field.h>
jint
java::lang::reflect::Field::getModifiers ()
diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc
index a62d1ff..0130ac4 100644
--- a/libjava/java/lang/reflect/natMethod.cc
+++ b/libjava/java/lang/reflect/natMethod.cc
@@ -12,9 +12,8 @@ details. */
#include <config.h>
-#include <cni.h>
+#include <gcj/cni.h>
#include <jvm.h>
-#include <java-array.h>
#include <java/lang/reflect/Method.h>
#include <java/lang/reflect/InvocationTargetException.h>
@@ -32,7 +31,7 @@ details. */
#include <java/lang/IllegalArgumentException.h>
#include <java/lang/NullPointerException.h>
#include <java/lang/Class.h>
-#include <java-method.h>
+#include <gcj/method.h>
#define ClassClass _CL_Q34java4lang5Class
extern java::lang::Class ClassClass;
generated by cgit v1.1 at 2025-09-04 08:26:50 +0000