-/* sizeof (struct Object) */
-#define JAVA_OBJECT_SIZE (get_java_object_header_size ())
-
-extern struct type *java_int_type;
-extern struct type *java_byte_type;
-extern struct type *java_short_type;
-extern struct type *java_long_type;
-extern struct type *java_boolean_type;
-extern struct type *java_char_type;
-extern struct type *java_float_type;
-extern struct type *java_double_type;
-extern struct type *java_void_type;
+struct builtin_java_type
+{
+ struct type *builtin_int;
+ struct type *builtin_byte;
+ struct type *builtin_short;
+ struct type *builtin_long;
+ struct type *builtin_boolean;
+ struct type *builtin_char;
+ struct type *builtin_float;
+ struct type *builtin_double;
+ struct type *builtin_void;
+};
+
+extern const struct builtin_java_type *builtin_java_type (struct gdbarch *);