Allow resetting an empty inferior-tty

[deliverable/binutils-gdb.git] / gdb / jv-typeprint.c

diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index 3ea81c3b171abaed046891fd049976ee30e71921..00abd9acda3e93598619edb6dfb7a4756cb9c070 100644 (file)
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -1,5 +1,5 @@
 /* Support for printing Java types for GDB, the GNU debugger.
-   Copyright (C) 1997-2015 Free Software Foundation, Inc.
+   Copyright (C) 1997-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -223,7 +223,8 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
              for (j = 0; j < n_overloads; j++)
                {
                  const char *real_physname;
-                 char *physname, *p;
+                 const char *p;
+                 char *physname;
                  int is_full_physname_constructor;
 
                  real_physname = TYPE_FN_FIELD_PHYSNAME (f, j);
@@ -233,7 +234,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
                  p = strrchr (real_physname, ')');
                  gdb_assert (p != NULL);
                  ++p;   /* Keep the trailing ')'.  */
-                 physname = alloca (p - real_physname + 1);
+                 physname = (char *) alloca (p - real_physname + 1);
                  memcpy (physname, real_physname, p - real_physname);
                  physname[p - real_physname] = '\0';