diff options
| author | Tom Tromey <tromey@adacore.com> | 2019-05-01 12:28:45 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2019-05-08 10:38:02 -0600 |
| commit | b0be6c912f9e901a87740c72f18be1e54ad5267d (patch) | |
| tree | eed5862b07cceb28adaf13108021243a7337a495 | |
| parent | 587ee17bd492a324c927437fb561b99b274e1d8e (diff) | |
| download | gdb-b0be6c912f9e901a87740c72f18be1e54ad5267d.zip gdb-b0be6c912f9e901a87740c72f18be1e54ad5267d.tar.gz gdb-b0be6c912f9e901a87740c72f18be1e54ad5267d.tar.bz2 | |
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 <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.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/defs.h | 3 | ||||
| -rw-r--r-- | gdb/interps.c | 1 | ||||
| -rw-r--r-- | gdb/main.h | 3 | ||||
| -rw-r--r-- | gdb/tui/tui-interp.c | 1 |
5 files changed, 12 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0293096..700afe7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2019-05-08 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. + +2019-05-08 Tom Tromey <tromey@adacore.com> + * dwarf2loc.c: Include dwarf2read.h. * defs.h (read_unsigned_leb128): Don't declare. * dwarf2read.h (read_unsigned_leb128): Declare. @@ -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 b62e333..dfd6eb9 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. */ @@ -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 14215b8..d1146fe 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. */ |