From 073bbbb058e36c60e5d30a4a25b48307429b7128 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sat, 12 Oct 2019 23:46:15 -0400 Subject: [PATCH] gdb: small cleanup in breakpoint.c's includes In an attempt to reduce the number of files re-build when some headers are touched, I ran include-what-you-use with breakpoint.c as a guinea pig. It revealed a few files that were unnecessary to include, which this patch removes. breakpoint.c uses tilde_expand from readline, hence the necessity to include tilde.h. AFAIK, it's fine to include just that, and not the whole readline headers. include-what-you-use also reported many header files that should be included but aren't, I suppose that breakpoint.c currently includes them indirectly. For now I'll pretend I didn't see that :). gdb/ChangeLog: * breakpoint.c: Remove some includes: continuations.h, skip.h, mi/mi-main.h, readline/readline.h, readline/history.h. Add include: readline/tilde.h. -#include "skip.h" #include "ax-gdb.h" #include "dummy-frame.h" #include "interps.h" @@ -69,11 +67,9 @@ #include "thread-fsm.h" #include "tid-parse.h" #include "cli/cli-style.h" -#include "mi/mi-main.h" /* readline include files */ -#include "readline/readline.h" -#include "readline/history.h" +#include "readline/tilde.h" /* readline defines this. */ #undef savestring Change-Id: I88bfe9071f2f973fd84caaf04b95c33a4dfb33de --- gdb/ChangeLog | 6 ++++++ gdb/breakpoint.c | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e6e1489fcfd..381bdc41bcd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-10-12 Simon Marchi + + * breakpoint.c: Remove some includes: continuations.h, skip.h, + mi/mi-main.h, readline/readline.h, readline/history.h. Add + include: readline/tilde.h. + 2019-10-12 Christian Biesinger * remote.c (remote_target::get_trace_status): Remove declaration of diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 0a705163386..31f4005ec7f 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -59,9 +59,7 @@ #include "gdb_regex.h" #include "probe.h" #include "cli/cli-utils.h" -#include "continuations.h" #include "stack.h" -#include "skip.h" #include "ax-gdb.h" #include "dummy-frame.h" #include "interps.h" @@ -69,11 +67,9 @@ #include "thread-fsm.h" #include "tid-parse.h" #include "cli/cli-style.h" -#include "mi/mi-main.h" /* readline include files */ -#include "readline/readline.h" -#include "readline/history.h" +#include "readline/tilde.h" /* readline defines this. */ #undef savestring -- 2.30.2