Merge GDB 7.5.1

gdb/jv-lang.h

 /* Java language support definitions for GDB, the GNU debugger.
 
    Copyright (C) 1997-2000, 2005, 2007-2012 Free Software Foundation,
    Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
@@ skipping 24 matching lines @@
   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 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 *);
 
 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);
 
 extern struct type *get_java_object_type (void);
 extern int get_java_object_header_size (struct gdbarch *);
 
 extern struct type *java_lookup_class (char *);
 
 extern int is_object_type (struct type *);
 
 /* Defined in jv-typeprint.c */
 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