Patchwork [2/4] Move interpreter_p declaration to main.h

login
register
mail settings
Submitter Tom Tromey
Date May 1, 2019, 6:44 p.m.
Message ID <20190501184402.4030-3-tromey@adacore.com>
Download mbox | patch
Permalink /patch/32478/
State New
Headers show

Comments

Tom Tromey - May 1, 2019, 6:44 p.m.
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-01  Tom Tromey  <tromey@adacore.com>

	* 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(-)

Patch

diff --git a/gdb/defs.h b/gdb/defs.h
index 673a200d5d0..5a1995b4991 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 b62e33339a2..dfd6eb90655 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 e707bf33efb..e44779a0560 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 14215b83dea..d1146fed0e6 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.  */