Fix --as-needed undefined symbol references from dynamic libraries.

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

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index a6db16290ef92c6a688c4f06592dfcf352b3c414..275733714fb9777d3a56cfb116db0bacc7d0dcf9 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -31,7 +31,7 @@
 #include "typeprint.h"
 #include "cp-abi.h"
 #include "jv-lang.h"
-#include "gdb_string.h"
+#include <string.h>
 #include <errno.h>
 #include "cp-support.h"
 
@@ -462,13 +462,10 @@ c_type_print_args (struct type *type, struct ui_file *stream,
                   int linkage_name, enum language language,
                   const struct type_print_options *flags)
 {
-  int i, len;
-  struct field *args;
+  int i;
   int printed_any = 0;
 
   fprintf_filtered (stream, "(");
-  args = TYPE_FIELDS (type);
-  len = TYPE_NFIELDS (type);
 
   for (i = 0; i < TYPE_NFIELDS (type); i++)
     {
@@ -1230,8 +1227,8 @@ c_type_print_base (struct type *type, struct ui_file *stream,
                    mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j);
 
                  demangled_name =
-                   cplus_demangle (mangled_name,
-                                   DMGL_ANSI | DMGL_PARAMS);
+                   gdb_demangle (mangled_name,
+                                 DMGL_ANSI | DMGL_PARAMS);
                  if (demangled_name == NULL)
                    {
                      /* In some cases (for instance with the HP
@@ -1298,7 +1295,6 @@ c_type_print_base (struct type *type, struct ui_file *stream,
                for (i = 0; i < TYPE_TYPEDEF_FIELD_COUNT (type); i++)
                  {
                    struct type *target = TYPE_TYPEDEF_FIELD_TYPE (type, i);
-                   struct typedef_hash_table *table2;
 
                    /* Dereference the typedef declaration itself.  */
                    gdb_assert (TYPE_CODE (target) == TYPE_CODE_TYPEDEF);