From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10137 invoked by alias); 1 Oct 2009 08:59:17 -0000 Received: (qmail 10127 invoked by uid 22791); 1 Oct 2009 08:59:16 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 01 Oct 2009 08:59:12 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n918wHt4018898; Thu, 1 Oct 2009 04:58:17 -0400 Received: from hase.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n918wEo1015254; Thu, 1 Oct 2009 04:58:16 -0400 From: Andreas Schwab To: Ralf Corsepius Cc: Joel Brobecker , gdb@sourceware.org, Jan Kratochvil , Tom Tromey , gdb-patches@gnu.org Subject: Re: GDB 6.8.92 available for testing References: <20090930204828.GB31446@adacore.com> <4AC41F44.1040502@rtems.org> X-Yow: I FORGOT to do the DISHES!! Date: Thu, 01 Oct 2009 08:59:00 -0000 In-Reply-To: <4AC41F44.1040502@rtems.org> (Ralf Corsepius's message of "Thu, 01 Oct 2009 05:17:24 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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/msg00008.txt.bz2 Ralf Corsepius writes: > --enable-system-readline also is still broken (Jan, please submit your > gdb-readline-6.0.patch you have applied to Fedora's gdb). 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). Andreas. 2009-10-01 Andreas Schwab * 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. --- 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 >= 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 = rl_prep_term_function; tui_old_rl_getc_function = rl_getc_function; tui_old_rl_outstream = rl_outstream; - tui_old_readline_echoing_p = readline_echoing_p; + tui_old_readline_echoing_p = _rl_echoing_p; rl_redisplay_function = tui_redisplay_readline; rl_deprep_term_function = tui_deprep_terminal; rl_prep_term_function = tui_prep_terminal; rl_getc_function = tui_getc; - readline_echoing_p = 0; + _rl_echoing_p = 0; rl_outstream = tui_rl_outstream; rl_prompt = 0; rl_completion_display_matches_hook = tui_rl_display_match_list; @@ -564,7 +569,7 @@ tui_setup_io (int mode) rl_getc_function = tui_old_rl_getc_function; rl_outstream = tui_old_rl_outstream; rl_completion_display_matches_hook = 0; - readline_echoing_p = tui_old_readline_echoing_p; + _rl_echoing_p = tui_old_readline_echoing_p; rl_already_prompted = 0; /* Save tty for SIGCONT. */ -- Andreas Schwab, schwab@redhat.com GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E "And now for something completely different."