gdb: Remove duplicate declaration of global innermost_block

The global 'innermost_block' is declared in two header files.  Remove
one of the declarations, and add an include of the other header into
the one source file that could no longer see a declaration of
'innermost_block'.

gdb/ChangeLog:

	* expression.h (innermost_block): Remove declaration.
	* varobj.c: Add 'parser-defs.h' include.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d2d44725a024640d8f51505940fb09d456a4c25f..a346dddcb2acae29dc72074bf1172923ee7c295b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-21  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * expression.h (innermost_block): Remove declaration.
+       * varobj.c: Add 'parser-defs.h' include.
+
 2018-01-19  Tom Tromey  <tom@tromey.com>
 
        * rust-lang.c (rust_lookup_symbol_nonlocal): Look up qualified

diff --git a/gdb/expression.h b/gdb/expression.h
index a783ea5fef23f4b20714a7d1e7a401035db9bc9d..030f2f08e7ae6440a844f69895bd87a40bf284fe 100644 (file)
--- a/gdb/expression.h
+++ b/gdb/expression.h
@@ -111,11 +111,6 @@ extern expression_up parse_exp_1 (const char **, CORE_ADDR pc,
    attempt completion.  */
 extern int parse_completion;
 
-/* The innermost context required by the stack and register variables
-   we've encountered so far.  To use this, set it to NULL, then call
-   parse_<whatever>, then look at it.  */
-extern const struct block *innermost_block;
-
 /* From eval.c */
 
 /* Values of NOSIDE argument to eval_subexp.  */

diff --git a/gdb/varobj.c b/gdb/varobj.c
index 01dabef37c32408d938eb2b509012dddadc9f413..701ef663766dd9770e0ba4b701407040a4973a5b 100644 (file)
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -30,6 +30,7 @@
 #include "gdbthread.h"
 #include "inferior.h"
 #include "varobj-iter.h"
+#include "parser-defs.h"
 
 #if HAVE_PYTHON
 #include "python/python.h"