-/* 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;
-
-extern int java_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
- struct ui_file *, int,
- const struct value_print_options *);
-
-extern int java_value_print (struct value *, struct ui_file *,
- const struct value_print_options *);
+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 *);
+
+extern void java_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
+ struct ui_file *, int,
+ const struct value *,
+ const struct value_print_options *);
+
+extern void java_value_print (struct value *, struct ui_file *,
+ const struct value_print_options *);