Merge GDB 7.5.1

gdb/jv-lang.h

Index: gdb/jv-lang.h
diff --git a/gdb/jv-lang.h b/gdb/jv-lang.h
index 4344706ef44ca385c7df712c41902abf3143f585..8ea9c3c24f8cd8f6a35e4e6af87dba3a3b83ba4e 100644
--- a/gdb/jv-lang.h
+++ b/gdb/jv-lang.h
@@ -42,13 +42,13 @@ struct builtin_java_type
 
 extern const struct builtin_java_type *builtin_java_type (struct gdbarch *);
 
-extern int 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_val_print (struct type *, const gdb_byte *, int, CORE_ADDR,
+			    struct ui_file *, int,
+			    const struct value *,
+			    const struct value_print_options *);
 
-extern int java_value_print (struct value *, struct ui_file *,
-			     const struct value_print_options *);
+extern void java_value_print (struct value *, struct ui_file *,
+			      const struct value_print_options *);
 
 extern struct value *java_class_from_object (struct value *);
 
@@ -57,7 +57,7 @@ extern struct type *type_from_class (struct gdbarch *, struct value *);
 extern struct type *java_primitive_type (struct gdbarch *, int signature);
 
 extern struct type *java_primitive_type_from_name (struct gdbarch *,
-						   char *, int);
+						   const char *, int);
 
 extern struct type *java_array_type (struct type *, int);
 
@@ -72,6 +72,6 @@ extern int is_object_type (struct type *);
 extern void java_print_type (struct type *, const char *,
 			     struct ui_file *, int, int);
 
-extern char *java_demangle_type_signature (char *);
+extern char *java_demangle_type_signature (const char *);
 
 #endif