diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/tui/tui-hooks.c | 6 | ||||
| -rw-r--r-- | gdb/tui/tui-io.c | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 323696f..228ba9c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2004-04-09 Mark Kettenis <kettenis@gnu.org> + * tui/tui-hooks.c: Include "readline/readline.h" after + "gdb_curses.h" instead of before. + * tui/tui-io.c: Likewise. + * tui/tui.c: Fix typo in comment. * sparc64-tdep.c (sparc_address_from_register): Remove function. diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c index a864be2..a3a80dd 100644 --- a/gdb/tui/tui-hooks.c +++ b/gdb/tui/tui-hooks.c @@ -35,7 +35,6 @@ #include "gdb-events.h" #include "ui-out.h" #include "top.h" -#include "readline/readline.h" #include <unistd.h> #include <fcntl.h> @@ -52,6 +51,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_curses.h". */ +#include "readline/readline.h" + int tui_target_has_run = 0; static void (* tui_target_new_objfile_chain) (struct objfile*); diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index addb3b0..a91a416 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -29,7 +29,6 @@ #include "event-top.h" #include "command.h" #include "top.h" -#include "readline/readline.h" #include "tui/tui.h" #include "tui/tui-data.h" #include "tui/tui-io.h" @@ -45,6 +44,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_curses.h". */ +#include "readline/readline.h" + int key_is_start_sequence (int ch) { |