* configure.in: Make --without-x work.

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

diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index 0bfe5595160c532ae099f730f357950df6ec2012..893082cc187ebb9e7498024cc670c2bad7c60768 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 1997-2000 Free Software Foundation, Inc.
+   Copyright 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -28,6 +28,7 @@
 #include "gdb_string.h"
 #include "typeprint.h"
 #include "c-lang.h"
+#include "cp-abi.h"
 
 /* Local functions */
 
@@ -122,7 +123,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
        {                       /* array type */
          char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));
          fputs_filtered (name, stream);
-         free (name);
+         xfree (name);
          break;
        }
 
@@ -151,7 +152,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
          fprintf_filtered (stream, "{\n");
          if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0))
            {
-             if (TYPE_FLAGS (type) & TYPE_FLAG_STUB)
+             if (TYPE_STUB (type))
                fprintfi_filtered (level + 4, stream, "<incomplete type>\n");
              else
                fprintfi_filtered (level + 4, stream, "<no data fields>\n");
@@ -224,12 +225,9 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
 
                  physname = TYPE_FN_FIELD_PHYSNAME (f, j);
 
-                 is_full_physname_constructor =
-                   ((physname[0] == '_' && physname[1] == '_'
-                     && strchr ("0123456789Qt", physname[2]))
-                    || STREQN (physname, "__ct__", 6)
-                    || DESTRUCTOR_PREFIX_P (physname)
-                    || STREQN (physname, "__dt__", 6));
+                 is_full_physname_constructor
+                    = (is_constructor_name (physname)
+                       || is_destructor_name (physname));
 
                  QUIT;
 
@@ -299,11 +297,11 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
                      }
 
                    fputs_filtered (demangled_no_class, stream);
-                   free (demangled_name);
+                   xfree (demangled_name);
                  }
 
                  if (TYPE_FN_FIELD_STUB (f, j))
-                   free (mangled_name);
+                   xfree (mangled_name);
 
                  fprintf_filtered (stream, ";\n");
                }