From: Mark Kettenis <kettenis@gnu.org>
Date: Sat, 28 Feb 2004 15:02:35 +0000 (+0000)
Subject: * tui/tui.c: Include <readline/readline.h> instead of
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=89ccc00e31dd3852fb2915dac3629be78dc0ad50;p=pf3gnuchains%2Fpf3gnuchains3x.git

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 401e1aea8e..cd38e5480a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-28  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".
+
 2004-02-27  Andrew Cagney  <cagney@redhat.com>
 
 	* hppa-tdep.c (hppa_gdbarch_init): On 32-bit systems always use
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 2c12621a53..d2186a2ef8 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -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"
@@ -57,6 +56,11 @@
 
 #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;
 static int tui_finish_init = 1;