From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14179 invoked by alias); 1 Oct 2009 09:35:25 -0000 Received: (qmail 14161 invoked by uid 22791); 1 Oct 2009 09:35:23 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.200.151) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 01 Oct 2009 09:35:18 +0000 Received: from baal.u-strasbg.fr (baal.u-strasbg.fr [IPv6:2001:660:2402::41]) by mailhost.u-strasbg.fr (8.14.2/jtpda-5.5pre1) with ESMTP id n919YAg7035757 ; Thu, 1 Oct 2009 11:34:10 +0200 (CEST) (envelope-from muller@ics.u-strasbg.fr) Received: from mailserver.u-strasbg.fr (ms1.u-strasbg.fr [IPv6:2001:660:2402:d::10]) by baal.u-strasbg.fr (8.14.0/jtpda-5.5pre1) with ESMTP id n919YAnM068987 ; Thu, 1 Oct 2009 11:34:10 +0200 (CEST) (envelope-from muller@ics.u-strasbg.fr) Received: from d620muller (gw-ics.u-strasbg.fr [130.79.210.225]) (user=mullerp mech=LOGIN) by mailserver.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id n919YAJV049023 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) ; Thu, 1 Oct 2009 11:34:10 +0200 (CEST) (envelope-from muller@ics.u-strasbg.fr) From: "Pierre Muller" To: "'Andreas Schwab'" , "'Ralf Corsepius'" Cc: "'Joel Brobecker'" , , "'Jan Kratochvil'" , "'Tom Tromey'" , References: <20090930204828.GB31446@adacore.com> <4AC41F44.1040502@rtems.org> In-Reply-To: Subject: RE: GDB 6.8.92 available for testing Date: Thu, 01 Oct 2009 09:35:00 -0000 Message-ID: <002e01ca427a$5f1363b0$1d3a2b10$@u-strasbg.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2009-10/txt/msg00009.txt.bz2 Andreas, why don't you simply use this? #if RL_VERSION_MAJOR >=3D 6 extern int _rl_echoing_p; #define readline_echoing_p _rl_echoing_p=20 #else extern int readline_echoing_p; #endif This would make your patch simpler, no? Is there a reason for replacing all readline_echoing_p by _rl_echoing_p? Pierre Muller Pascal language support maintainer for GDB > -----Message d'origine----- > De=A0: gdb-owner@sourceware.org [mailto:gdb-owner@sourceware.org] De la > part de Andreas Schwab > Envoy=E9=A0: Thursday, October 01, 2009 10:58 AM > =C0=A0: Ralf Corsepius > Cc=A0: Joel Brobecker; gdb@sourceware.org; Jan Kratochvil; Tom Tromey; > gdb-patches@gnu.org > Objet=A0: Re: GDB 6.8.92 available for testing >=20 > Ralf Corsepius writes: >=20 > > --enable-system-readline also is still broken (Jan, please submit > your > > gdb-readline-6.0.patch you have applied to Fedora's gdb). >=20 > Here is the patch I've been using for the openSUSE package. I have > renamed the uses of readline_echoing_p to _rl_echoing_p to emphasize > its > internal nature (future readline versions may even stop exporting it). >=20 > Andreas. >=20 > 2009-10-01 Andreas Schwab >=20 > * tui/tui-io.c (tui_rl_display_match_list): Use _rl_echoing_p > instead of readline_echoing_p for version 6 or later of > libreadline. >=20 > --- gdb/tui/tui-io.c.orig 2009-03-10 11:34:01.000000000 +0100 > +++ gdb/tui/tui-io.c 2009-03-10 11:34:45.000000000 +0100 > @@ -512,8 +512,13 @@ tui_rl_display_match_list (char **matche > void > tui_setup_io (int mode) > { > +#if RL_VERSION_MAJOR >=3D 6 > + extern int _rl_echoing_p; > +#else > extern int readline_echoing_p; > - > +#define _rl_echoing_p readline_echoing_p > +#endif > + > if (mode) > { > /* Redirect readline to TUI. */ > @@ -522,12 +527,12 @@ tui_setup_io (int mode) > tui_old_rl_prep_terminal =3D rl_prep_term_function; > tui_old_rl_getc_function =3D rl_getc_function; > tui_old_rl_outstream =3D rl_outstream; > - tui_old_readline_echoing_p =3D readline_echoing_p; > + tui_old_readline_echoing_p =3D _rl_echoing_p; > rl_redisplay_function =3D tui_redisplay_readline; > rl_deprep_term_function =3D tui_deprep_terminal; > rl_prep_term_function =3D tui_prep_terminal; > rl_getc_function =3D tui_getc; > - readline_echoing_p =3D 0; > + _rl_echoing_p =3D 0; > rl_outstream =3D tui_rl_outstream; > rl_prompt =3D 0; > rl_completion_display_matches_hook =3D tui_rl_display_match_list; > @@ -564,7 +569,7 @@ tui_setup_io (int mode) > rl_getc_function =3D tui_old_rl_getc_function; > rl_outstream =3D tui_old_rl_outstream; > rl_completion_display_matches_hook =3D 0; > - readline_echoing_p =3D tui_old_readline_echoing_p; > + _rl_echoing_p =3D tui_old_readline_echoing_p; > rl_already_prompted =3D 0; >=20 > /* Save tty for SIGCONT. */ >=20 > -- > Andreas Schwab, schwab@redhat.com > GPG Key fingerprint =3D D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 > 984E > "And now for something completely different."