aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog14
-rw-r--r--gdb/cli/cli-cmds.c1
-rw-r--r--gdb/cli/cli-dump.c2
-rw-r--r--gdb/corelow.c2
-rw-r--r--gdb/exec.c2
-rw-r--r--gdb/psymtab.c2
-rw-r--r--gdb/solib.c2
-rw-r--r--gdb/source.c2
-rw-r--r--gdb/symfile.c2
-rw-r--r--gdb/symmisc.c2
-rw-r--r--gdb/tui/tui-hooks.c5
-rw-r--r--gdb/tui/tui-interp.c1
12 files changed, 22 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e886480..048c2dd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,17 @@
+2019-11-06 Tom Tromey <tom@tromey.com>
+
+ * 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 <tom@tromey.com>
* 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 4e58ddc..409240c 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 74e0057..7c4f63b 100644
--- 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 b32fa95..fa1661e 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 6bdf9ab..efc504e 100644
--- 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 df10a75..67e3e36 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 17d0c4c..400fdde 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 9f53d65..d9cd5f3 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 <algorithm>
diff --git a/gdb/symfile.c b/gdb/symfile.c
index c5d226e..e6b34bc 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 c91ad5e..24ee255 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 2555da7..bb96f4d 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 <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 ea562ac..bc8fde3 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"