extern void
java_error PARAMS ((char *)); /* Defined in jv-exp.y */
-#define JAVA_OBJECT_SIZE (6 * 4) /* sizeof (struct Object) FIXME ! */
+#define JAVA_OBJECT_SIZE (1 * 4) /* sizeof (struct Object) FIXME ! */
extern struct type *java_int_type;
extern struct type *java_byte_type;
extern struct objfile *dynamics_objfile;
extern int
-java_val_print PARAMS ((struct type *, char *, CORE_ADDR, GDB_FILE *, int, int,
+java_val_print PARAMS ((struct type *, char *, int, CORE_ADDR, GDB_FILE *, int, int,
int, enum val_prettyprint));
extern int
extern struct type *java_array_type PARAMS ((struct type*, int));
-extern struct type *get_java_object_type ();
+extern struct type *get_java_object_type PARAMS ((void));
extern struct type * java_lookup_class PARAMS((char *));
extern void /* Defined in jv-typeprint.c */
java_print_type PARAMS ((struct type *, char *, GDB_FILE *, int, int));
+
+extern char * java_demangle_type_signature PARAMS ((char *));