Merge GDB 7.5.1

gdb/jv-typeprint.c

 /* Support for printing Java types for GDB, the GNU debugger.
    Copyright (C) 1997-2000, 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
    (at your option) any later version.
 
@@ skipping 21 matching lines @@
 
 /* Local functions */
 
 static void java_type_print_base (struct type * type,
                                   struct ui_file *stream, int show,
                                   int level);
 
 static void
 java_type_print_derivation_info (struct ui_file *stream, struct type *type)
 {
-  char *name;
+  const char *name;
   int i;
   int n_bases;
   int prev;
 
   n_bases = TYPE_N_BASECLASSES (type);
 
   for (i = 0, prev = 0; i < n_bases; i++)
     {
       int kind;
 
@@ skipping 148 matching lines @@
           len = TYPE_NFN_FIELDS (type);
           if (len)
             fprintf_filtered (stream, "\n");
 
           /* Print out the methods.  */
 
           for (i = 0; i < len; i++)
             {
               struct fn_field *f;
               int j;
-              char *method_name;
-              char *name;
+              const char *method_name;
+              const char *name;
               int is_constructor;
               int n_overloads;
 
               f = TYPE_FN_FIELDLIST1 (type, i);
               n_overloads = TYPE_FN_FIELDLIST_LENGTH (type, i);
               method_name = TYPE_FN_FIELDLIST_NAME (type, i);
               name = type_name_no_tag (type);
               is_constructor = name && strcmp (method_name, name) == 0;
 
               for (j = 0; j < n_overloads; j++)
@@ skipping 99 matching lines @@
         }
       break;
 
     default:
       c_type_print_base (type, stream, show, level);
     }
 }
 
 /* LEVEL is the depth to indent lines by.  */
 
-extern void c_type_print_varspec_suffix (struct type *, struct ui_file *,
-                                         int, int, int);
-
 void
 java_print_type (struct type *type, const char *varstring,
                  struct ui_file *stream, int show, int level)
 {
   int demangled_args;
 
   java_type_print_base (type, stream, show, level);
 
   if (varstring != NULL && *varstring != '\0')
     {
       fputs_filtered (" ", stream);
       fputs_filtered (varstring, stream);
     }
 
   /* For demangled function names, we have the arglist as part of the name,
      so don't print an additional pair of ()'s.  */
 
   demangled_args = varstring != NULL && strchr (varstring, '(') != NULL;
   c_type_print_varspec_suffix (type, stream, show, 0, demangled_args);
 }