* 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 401e1ae..cd38e54 100644 (file)
--- 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 2c12621..d2186a2 100644 (file)
--- 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;