Clean up misapplied patch:

* dwarf2read.c (determine_prefix): Change one of the two forward
declarations for 'determine_prefix_aux' to a declaration for this.
(read_func_scope): Use cu->language, not cu_language.  Pass 'cu'
argument to 'die_specification'.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3fa492dc65a85b4486f0a5899d7e42c72645d8d0..c939ebf3925f2bd7872e63213de3aab98613f83d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-27  Jim Blandy  <jimb@redhat.com>
+
+       Clean up misapplied patch:
+       * dwarf2read.c (determine_prefix): Change one of the two forward
+       declarations for 'determine_prefix_aux' to a declaration for this.
+       (read_func_scope): Use cu->language, not cu_language.  Pass 'cu'
+       argument to 'die_specification'.
+
 2004-01-27  Paul N. Hilfinger  <hilfinger@gnat.com>
        
        * breakpoint.c (breakpoint_re_set_one): Set b->cond, b->val, and

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 0991aaeb9163d80eefad240e3b3359b383d2bb1a..94d210c3f424f38e35dd38195c59929e95641a2d 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -765,7 +765,7 @@ static struct type *tag_type_to_type (struct die_info *, struct dwarf2_cu *);
 
 static void read_type_die (struct die_info *, struct dwarf2_cu *);
 
-static char *determine_prefix_aux (struct die_info *die, struct dwarf2_cu *);
+static char *determine_prefix (struct die_info *die, struct dwarf2_cu *);
 
 static char *determine_prefix_aux (struct die_info *die, struct dwarf2_cu *);
 
@@ -2169,9 +2169,9 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
   if (name == NULL || !dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu))
     return;
 
-  if (cu_language == language_cplus)
+  if (cu->language == language_cplus)
     {
-      struct die_info *spec_die = die_specification (die);
+      struct die_info *spec_die = die_specification (die, cu);
 
          /* NOTE: carlton/2004-01-23: We have to be careful in the
             presence of DW_AT_specification.  For example, with GCC