From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24162 invoked by alias); 3 Oct 2002 02:22:34 -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 24153 invoked from network); 3 Oct 2002 02:22:33 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sources.redhat.com with SMTP; 3 Oct 2002 02:22:33 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id g9323b031365 for ; Wed, 2 Oct 2002 22:03:37 -0400 Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [172.16.52.156]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id g932MWf14522 for ; Wed, 2 Oct 2002 22:22:32 -0400 Received: from localhost.redhat.com (IDENT:root@tooth.toronto.redhat.com [172.16.14.29]) by pobox.corp.redhat.com (8.11.6/8.11.6) with ESMTP id g932MU915311 for ; Wed, 2 Oct 2002 22:22:31 -0400 Received: by localhost.redhat.com (Postfix, from userid 469) id C190CFF79; Wed, 2 Oct 2002 22:20:06 -0400 (EDT) From: Elena Zannoni MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <15771.43349.966567.968157@localhost.redhat.com> Date: Wed, 02 Oct 2002 19:22:00 -0000 To: Joel Brobecker Cc: gdb-patches@sources.redhat.com Subject: Re: [RFA] Ooopsie in mi/mi-main.c In-Reply-To: <20021003015829.GJ18721@gnat.com> References: <20021003015829.GJ18721@gnat.com> X-SW-Source: 2002-10/txt/msg00098.txt.bz2 Joel Brobecker writes: > The following change broke the build: > > * mi-main.c (mi_cmd_exec_return): Don't use > return_command_wrapper, use return_command instead. > (mi_cmd_exec_interrupt): Don't use > interrupt_target_command_wrapper, use interrupt_target_command > instead. > > I am quite busy at the moment, so did not spend too much time investigating > how this should be fixed. I suggest the following fix. > > 2002-10-02 Joel Brobecker > > * infcmd.c (interrupt_target_command): Make non-static, as it > is now needed by mi-main.c. > * stack.c (return_command): Likewise. > > Ok to apply? > Ouch, sorry. I forgot to check in a part of the patch. I am doing it now. Elena > Thanks, > -- > Joel > Index: infcmd.c > =================================================================== > RCS file: /cvs/src/src/gdb/infcmd.c,v > retrieving revision 1.56 > diff -c -3 -p -r1.56 infcmd.c > *** infcmd.c 25 Sep 2002 20:30:37 -0000 1.56 > --- infcmd.c 3 Oct 2002 01:55:21 -0000 > *************** void all_registers_info (char *, int); > *** 50,55 **** > --- 50,57 ---- > > void registers_info (char *, int); > > + void interrupt_target_command (char *args, int from_tty); > + > /* Local functions: */ > > void continue_command (char *, int); > *************** static void float_info (char *, int); > *** 72,79 **** > > static void detach_command (char *, int); > > - static void interrupt_target_command (char *args, int from_tty); > - > static void unset_environment_command (char *, int); > > static void set_environment_command (char *, int); > --- 74,79 ---- > *************** interrupt_target_command_wrapper (char * > *** 1898,1904 **** > interrupt_target_command (args, from_tty); > } > > ! static void > interrupt_target_command (char *args, int from_tty) > { > if (event_loop_p && target_can_async_p ()) > --- 1898,1904 ---- > interrupt_target_command (args, from_tty); > } > > ! void > interrupt_target_command (char *args, int from_tty) > { > if (event_loop_p && target_can_async_p ()) > Index: stack.c > =================================================================== > RCS file: /cvs/src/src/gdb/stack.c,v > retrieving revision 1.44 > diff -c -3 -p -r1.44 stack.c > *** stack.c 22 Sep 2002 22:18:41 -0000 1.44 > --- stack.c 3 Oct 2002 01:55:21 -0000 > *************** void args_info (char *, int); > *** 46,59 **** > > void locals_info (char *, int); > > void (*selected_frame_level_changed_hook) (int); > > void _initialize_stack (void); > > /* Prototypes for local functions. */ > > - static void return_command (char *, int); > - > static void down_command (char *, int); > > static void down_silently_base (char *); > --- 46,59 ---- > > void locals_info (char *, int); > > + void return_command (char *, int); > + > void (*selected_frame_level_changed_hook) (int); > > void _initialize_stack (void); > > /* Prototypes for local functions. */ > > static void down_command (char *, int); > > static void down_silently_base (char *); > *************** return_command_wrapper (char *retval_exp > *** 1760,1766 **** > return_command (retval_exp, from_tty); > } > > ! static void > return_command (char *retval_exp, int from_tty) > { > struct symbol *thisfun; > --- 1760,1766 ---- > return_command (retval_exp, from_tty); > } > > ! void > return_command (char *retval_exp, int from_tty) > { > struct symbol *thisfun;