From b0be6c912f9e901a87740c72f18be1e54ad5267d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 1 May 2019 12:28:45 -0600 Subject: [PATCH] Move interpreter_p declaration to main.h This moves the interpreter_p declaration from defs.h to main.h. I think this makes more sense, as it is defined in main.c. Also, this declaration was in the wrong place -- between a comment and the things the comment described. gdb/ChangeLog 2019-05-08 Tom Tromey * tui/tui-interp.c: Include main.h. * interps.c: Include main.h. * main.h (interpreter_p): Declare. * defs.h (interpreter_p): Don't declare. --- gdb/ChangeLog | 7 +++++++ gdb/defs.h | 3 --- gdb/interps.c | 1 + gdb/main.h | 3 +++ gdb/tui/tui-interp.c | 1 + 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0293096ee2..700afe7526 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-05-08 Tom Tromey + + * tui/tui-interp.c: Include main.h. + * interps.c: Include main.h. + * main.h (interpreter_p): Declare. + * defs.h (interpreter_p): Don't declare. + 2019-05-08 Tom Tromey * dwarf2loc.c: Include dwarf2read.h. diff --git a/gdb/defs.h b/gdb/defs.h index 673a200d5d..5a1995b499 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -584,9 +584,6 @@ extern int watchdog; /* Hooks for alternate command interfaces. */ -/* * The name of the interpreter if specified on the command line. */ -extern char *interpreter_p; - struct target_waitstatus; struct cmd_list_element; diff --git a/gdb/interps.c b/gdb/interps.c index b62e33339a..dfd6eb9065 100644 --- a/gdb/interps.c +++ b/gdb/interps.c @@ -38,6 +38,7 @@ #include "completer.h" #include "top.h" /* For command_loop. */ #include "continuations.h" +#include "main.h" /* Each UI has its own independent set of interpreters. */ diff --git a/gdb/main.h b/gdb/main.h index e707bf33ef..e44779a056 100644 --- a/gdb/main.h +++ b/gdb/main.h @@ -35,6 +35,9 @@ extern int return_child_result_value; extern int batch_silent; extern int batch_flag; +/* * The name of the interpreter if specified on the command line. */ +extern char *interpreter_p; + /* From mingw-hdep.c, used by main.c. */ /* Return argv[0] in absolute form, if possible, or ARGV0 if not. The diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c index 14215b83de..d1146fed0e 100644 --- a/gdb/tui/tui-interp.c +++ b/gdb/tui/tui-interp.c @@ -34,6 +34,7 @@ #include "observable.h" #include "gdbthread.h" #include "inferior.h" +#include "main.h" /* Set to 1 when the TUI mode must be activated when we first start gdb. */ -- 2.34.1