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  <[email protected]>

	* 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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e886480d62d02c3a5c58769e9417869d40b922ed..048c2dd484369a037d7233a83e2f28104bf8383b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2019-11-06  Tom Tromey  <[email protected]>
+
+       * 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  <[email protected]>
 
        * tui/tui-disasm.c (struct tui_asm_line) <addr_size>: New member.

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 4e58ddc6d6ef902784df5c77dbf0cce43c473a0d..409240c118ca3d6bd8646b386855862e27c9e31e 100644 (file)
--- 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 74e0057d4aba08ec8230051cfceea376710f7a5a..7c4f63be06d38ab0c76370e6b0f76a91f74f0b9d 100644 (file)
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -26,7 +26,7 @@
 #include "completer.h"
 #include <ctype.h>
 #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 b32fa955fdab305a812636518e3b7758db57f8f6..fa1661ee61ddc8f689136f4fd88f9168efb8dcab 100644 (file)
--- 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 6bdf9abb3e42fc29837c7efadb5f07ad8913f5dc..efc504eca47fd9a7128940087a2f1c204577e6fd 100644 (file)
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -38,7 +38,7 @@
 #include "source.h"
 
 #include <fcntl.h>
-#include "readline/readline.h"
+#include "readline/tilde.h"
 #include "gdbcore.h"
 
 #include <ctype.h>

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index df10a756fd180b56278b8cf10af726d90635215f..67e3e36aa9ee98b2351b50b83ec51721ebd40c98 100644 (file)
--- 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 17d0c4cea21139be9bc3d158a606bcd398a7e44a..400fddedb62c82c3305ee88098466424888de4ab 100644 (file)
--- 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 9f53d654f36f1abd9fc00d2348ba1c671ad7c9c7..d9cd5f32caf68e70fbb99d4e08f2a9ced945966f 100644 (file)
--- 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 <algorithm>

diff --git a/gdb/symfile.c b/gdb/symfile.c
index c5d226ec0d176bbea94288349142f5427178b5f1..e6b34bc6b79deaeaaa1af05d6e88842df65a97da 100644 (file)
--- 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 c91ad5e5f455502886b6bf19b0b1395f3274b25a..24ee255f6b643103c1236e764c8153fd092cb963 100644 (file)
--- 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 2555da7f1ae2916070cb0edeede6142c2414dd23..bb96f4d9bbd8e7ac3618f0c718e6e598ef72a21a 100644 (file)
--- 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 <term.h> 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 ea562acb6ce68c5a78fe96b638d294d1536f8ceb..bc8fde363bf80144ed21604179455b4d6262c9e8 100644 (file)
--- 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"