From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-31119-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 8592 invoked by alias); 28 Feb 2004 15:03:53 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 8584 invoked from network); 28 Feb 2004 15:03:52 -0000
Received: from unknown (HELO walton.kettenis.dyndns.org) (213.93.115.144)
  by sources.redhat.com with SMTP; 28 Feb 2004 15:03:52 -0000
Received: from elgar.kettenis.dyndns.org (elgar.kettenis.dyndns.org [192.168.0.2])
	by walton.kettenis.dyndns.org (8.12.6p3/8.12.6) with ESMTP id i1SF3poq000664
	for <gdb-patches@sources.redhat.com>; Sat, 28 Feb 2004 16:03:51 +0100 (CET)
	(envelope-from kettenis@elgar.kettenis.dyndns.org)
Received: from elgar.kettenis.dyndns.org (localhost [127.0.0.1])
	by elgar.kettenis.dyndns.org (8.12.6p3/8.12.6) with ESMTP id i1SF3pbh011823
	for <gdb-patches@sources.redhat.com>; Sat, 28 Feb 2004 16:03:51 +0100 (CET)
	(envelope-from kettenis@elgar.kettenis.dyndns.org)
Received: (from kettenis@localhost)
	by elgar.kettenis.dyndns.org (8.12.6p3/8.12.6/Submit) id i1SF3p8g011820;
	Sat, 28 Feb 2004 16:03:51 +0100 (CET)
Date: Sat, 28 Feb 2004 15:03:00 -0000
Message-Id: <200402281503.i1SF3p8g011820@elgar.kettenis.dyndns.org>
From: Mark Kettenis <kettenis@chello.nl>
To: gdb-patches@sources.redhat.com
Subject: [PATCH] Fix compilation of tui/tui.c
X-SW-Source: 2004-02/txt/msg00819.txt.bz2

Ouch.  We have serious portability problems with the TUI.  We should
either disable it again before the 6.1 release, or be prepared to
release 6.1.1 if any build problems come up.  I'm sure we'll see build
problems on many systems that we don't regularly test.

Anyway, I committed the attached such that FreeBSD (and probably the
other BSD's work again/.

Mark


Index: ChangeLog
from  Mark Kettenis  <kettenis@gnu.org>

	* tui/tui.c: Include <readline/readline.h> instead of
	"readline/readline.h".  Include it after <term.h> and
	"gdb_curses.h".

Index: tui/tui.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui.c,v
retrieving revision 1.48
diff -u -p -r1.48 tui.c
--- tui/tui.c 26 Feb 2004 02:08:04 -0000 1.48
+++ tui/tui.c 28 Feb 2004 14:59:29 -0000
@@ -34,7 +34,6 @@
 #include "tui/tui-win.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-windata.h"
-#include "readline/readline.h"
 #include "target.h"
 #include "frame.h"
 #include "breakpoint.h"
@@ -56,6 +55,11 @@
 #include <setjmp.h>
 
 #include "gdb_curses.h"
+
+/* This redefines CTRL if it is not already defined, so it must come
+   after terminal state releated include files like <term.h> and
+   "gdb_ncurses.h".  */
+#include <readline/readline.h>
 
 /* Tells whether the TUI is active or not.  */
 int tui_active = 0;