* Makefile.in (VERSION): Bump to 4.7.4.

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

diff --git a/gdb/symtab.c b/gdb/symtab.c
index d27e8a8448405532c5fa72e165d3e57d893a5ba5..7e6c0225d85cc6abe79367e6938665612c795a79 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1145,7 +1145,7 @@ find_pc_line (pc, notcurrent)
       val.pc = best->pc;
       if (best_end && (!alt || best_end < alt->pc))
        val.end = best_end;
-      else if (alt->pc)
+      else if (alt)
        val.end = alt->pc;
       else
        val.end = BLOCK_END (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK));
@@ -2352,7 +2352,7 @@ list_symbols (regexp, class, bpt)
                    /* Typedef that is not a C++ class */
                    if (class == 2
                        && SYMBOL_NAMESPACE (sym) != STRUCT_NAMESPACE)
-                     typedef_print (SYMBOL_TYPE(sym), sym, stdout);
+                     c_typedef_print (SYMBOL_TYPE(sym), sym, stdout);
                    /* variable, func, or typedef-that-is-c++-class */
                    else if (class < 2 || 
                             (class == 2 && 
@@ -2367,13 +2367,15 @@ list_symbols (regexp, class, bpt)
                      }
                    else
                      {
-# if 0
-/* FIXME, why is this zapped out? */
+# if 0  /* FIXME, why is this zapped out? */
                        char buf[1024];
-                       type_print_base (TYPE_FN_FIELD_TYPE(t, i), stdout, 0, 0); 
-                       type_print_varspec_prefix (TYPE_FN_FIELD_TYPE(t, i), stdout, 0); 
+                       c_type_print_base (TYPE_FN_FIELD_TYPE(t, i),
+                                          stdout, 0, 0); 
+                       c_type_print_varspec_prefix (TYPE_FN_FIELD_TYPE(t, i),
+                                                    stdout, 0); 
                        sprintf (buf, " %s::", type_name_no_tag (t));
-                       type_print_method_args (TYPE_FN_FIELD_ARGS (t, i), buf, name, stdout);
+                       cp_type_print_method_args (TYPE_FN_FIELD_ARGS (t, i),
+                                                  buf, name, stdout);
 # endif
                      }
                  }