From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29873 invoked by alias); 28 Jan 2004 05:51:24 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 29818 invoked from network); 28 Jan 2004 05:51:22 -0000 Received: from unknown (HELO zenia.home) (12.223.225.216) by sources.redhat.com with SMTP; 28 Jan 2004 05:51:22 -0000 Received: by zenia.home (Postfix, from userid 5433) id CCBFD207A3; Wed, 28 Jan 2004 00:51:10 -0500 (EST) To: gdb-patches@sources.redhat.com Subject: PATCH: clean up misapplied patch to dwarf2read.c From: Jim Blandy Date: Wed, 28 Jan 2004 05:51:00 -0000 Message-ID: User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2004-01/txt/msg00718.txt.bz2 Committed as obvious. 2004-01-27 Jim Blandy 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'. Index: gdb/dwarf2read.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2read.c,v retrieving revision 1.127 diff -c -r1.127 dwarf2read.c *** gdb/dwarf2read.c 27 Jan 2004 20:47:20 -0000 1.127 --- gdb/dwarf2read.c 28 Jan 2004 04:01:22 -0000 *************** *** 765,771 **** 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_aux (struct die_info *die, struct dwarf2_cu *); --- 765,771 ---- static void read_type_die (struct die_info *, 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,2177 **** if (name == NULL || !dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu)) return; ! if (cu_language == language_cplus) { ! struct die_info *spec_die = die_specification (die); /* NOTE: carlton/2004-01-23: We have to be careful in the presence of DW_AT_specification. For example, with GCC --- 2169,2177 ---- if (name == NULL || !dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu)) return; ! if (cu->language == language_cplus) { ! 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