From e0eac551da0afeec8ec17f457e4e1da1756e0aab Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 27 Oct 2019 15:50:54 -0600 Subject: [PATCH] Remove some includes of readline.h I went through most of the spots that include readline.h and, when appropriate, either removed the include or changed it to include tilde.h. Note that remote-sim.c and bsd-kvm.c could probably include tilde.h instead, but I did not change these. I think I can't build the latter, and I didn't want to set up a sim build for the former. Tested by rebuilding. gdb/ChangeLog 2019-11-06 Tom Tromey * tui/tui-interp.c: Don't include readline.h. * tui/tui-hooks.c: Don't include readline.h. * symmisc.c: Include tilde.h, not readline.h. * symfile.c: Include tilde.h, not readline.h. * source.c: Include tilde.h, not readline.h. * solib.c: Include tilde.h, not readline.h. * psymtab.c: Include tilde.h, not readline.h. * exec.c: Include tilde.h, not readline.h. * corelow.c: Include tilde.h, not readline.h. * cli/cli-dump.c: Include tilde.h, not readline.h. * cli/cli-cmds.c: Don't include readline.h. Change-Id: I60487a190c43128b800ef77517d1ab42957571d7 --- gdb/ChangeLog | 14 ++++++++++++++ gdb/cli/cli-cmds.c | 1 - gdb/cli/cli-dump.c | 2 +- gdb/corelow.c | 2 +- gdb/exec.c | 2 +- gdb/psymtab.c | 2 +- gdb/solib.c | 2 +- gdb/source.c | 2 +- gdb/symfile.c | 2 +- gdb/symmisc.c | 2 +- gdb/tui/tui-hooks.c | 5 ----- gdb/tui/tui-interp.c | 1 - 12 files changed, 22 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e886480d62d..048c2dd4843 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2019-11-06 Tom Tromey + + * tui/tui-interp.c: Don't include readline.h. + * tui/tui-hooks.c: Don't include readline.h. + * symmisc.c: Include tilde.h, not readline.h. + * symfile.c: Include tilde.h, not readline.h. + * source.c: Include tilde.h, not readline.h. + * solib.c: Include tilde.h, not readline.h. + * psymtab.c: Include tilde.h, not readline.h. + * exec.c: Include tilde.h, not readline.h. + * corelow.c: Include tilde.h, not readline.h. + * cli/cli-dump.c: Include tilde.h, not readline.h. + * cli/cli-cmds.c: Don't include readline.h. + 2019-11-05 Tom Tromey * tui/tui-disasm.c (struct tui_asm_line) : New member. diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 4e58ddc6d6e..409240c118c 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -19,7 +19,6 @@ #include "defs.h" #include "arch-utils.h" -#include "readline/readline.h" #include "readline/tilde.h" #include "completer.h" #include "target.h" /* For baud_rate, remote_debug and remote_timeout. */ diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c index 74e0057d4ab..7c4f63be06d 100644 --- a/gdb/cli/cli-dump.c +++ b/gdb/cli/cli-dump.c @@ -26,7 +26,7 @@ #include "completer.h" #include #include "target.h" -#include "readline/readline.h" +#include "readline/tilde.h" #include "gdbcore.h" #include "cli/cli-utils.h" #include "gdb_bfd.h" diff --git a/gdb/corelow.c b/gdb/corelow.c index b32fa955fda..fa1661ee61d 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -35,7 +35,7 @@ #include "regset.h" #include "symfile.h" #include "exec.h" -#include "readline/readline.h" +#include "readline/tilde.h" #include "solib.h" #include "filenames.h" #include "progspace.h" diff --git a/gdb/exec.c b/gdb/exec.c index 6bdf9abb3e4..efc504eca47 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -38,7 +38,7 @@ #include "source.h" #include -#include "readline/readline.h" +#include "readline/tilde.h" #include "gdbcore.h" #include diff --git a/gdb/psymtab.c b/gdb/psymtab.c index df10a756fd1..67e3e36aa9e 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -28,7 +28,7 @@ #include "gdbtypes.h" #include "ui-out.h" #include "command.h" -#include "readline/readline.h" +#include "readline/tilde.h" #include "gdb_regex.h" #include "dictionary.h" #include "language.h" diff --git a/gdb/solib.c b/gdb/solib.c index 17d0c4cea21..400fddedb62 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -39,7 +39,7 @@ #include "exec.h" #include "solist.h" #include "observable.h" -#include "readline/readline.h" +#include "readline/tilde.h" #include "remote.h" #include "solib.h" #include "interps.h" diff --git a/gdb/source.c b/gdb/source.c index 9f53d654f36..d9cd5f32caf 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -40,7 +40,7 @@ #include "filenames.h" /* for DOSish file names */ #include "completer.h" #include "ui-out.h" -#include "readline/readline.h" +#include "readline/tilde.h" #include "gdbsupport/enum-flags.h" #include "gdbsupport/scoped_fd.h" #include diff --git a/gdb/symfile.c b/gdb/symfile.c index c5d226ec0d1..e6b34bc6b79 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -44,7 +44,7 @@ #include "completer.h" #include "bcache.h" #include "hashtab.h" -#include "readline/readline.h" +#include "readline/tilde.h" #include "block.h" #include "observable.h" #include "exec.h" diff --git a/gdb/symmisc.c b/gdb/symmisc.c index c91ad5e5f45..24ee255f6b6 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -36,7 +36,7 @@ #include "typeprint.h" #include "gdbcmd.h" #include "source.h" -#include "readline/readline.h" +#include "readline/tilde.h" #include "psymtab.h" diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c index 2555da7f1ae..bb96f4d9bbd 100644 --- a/gdb/tui/tui-hooks.c +++ b/gdb/tui/tui-hooks.c @@ -49,11 +49,6 @@ #include "gdb_curses.h" -/* This redefines CTRL if it is not already defined, so it must come - after terminal state releated include files like and - "gdb_curses.h". */ -#include "readline/readline.h" - static void tui_new_objfile_hook (struct objfile* objfile) { diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c index ea562acb6ce..bc8fde363bf 100644 --- a/gdb/tui/tui-interp.c +++ b/gdb/tui/tui-interp.c @@ -26,7 +26,6 @@ #include "ui-out.h" #include "cli-out.h" #include "tui/tui-data.h" -#include "readline/readline.h" #include "tui/tui-win.h" #include "tui/tui.h" #include "tui/tui-io.h" -- 2.30.2