aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Biesinger <cbiesinger@google.com>2019-10-10 12:42:41 -0500
committerChristian Biesinger <cbiesinger@google.com>2019-10-10 12:42:41 -0500
commit26344e0c532379477be3a203c80722051521a55e (patch)
treec4d912bb13a2115a52ccb1c14096dd72b43ab041
parentc2c440a9038acc7b94ffbc83f4711dbf08b582a9 (diff)
downloadgdb-26344e0c532379477be3a203c80722051521a55e.zip
gdb-26344e0c532379477be3a203c80722051521a55e.tar.gz
gdb-26344e0c532379477be3a203c80722051521a55e.tar.bz2
Include gdbtk.h to avoid declarations
Once https://sourceware.org/ml/insight/2019-q4/msg00000.html lands, we can just include gdbtk.h to get the declarations for external_editor_command and gdbtk_test, instead of having to declare them here in main.c. gdb/ChangeLog: 2019-10-07 Christian Biesinger <cbiesinger@google.com> * main.c (captured_main_1): Include gdbtk.h and remove declarations for external_editor_command and gdbtk_test.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/main.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2abae43..fba57f3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2019-10-10 Christian Biesinger <cbiesinger@google.com>
+ * main.c (captured_main_1): Include gdbtk.h and remove declarations
+ for external_editor_command and gdbtk_test.
+
+2019-10-10 Christian Biesinger <cbiesinger@google.com>
+
* mi/mi-cmd-var.c (varobjdebug): Remove declaration.
* varobj.c (varobjdebug): Move comment to...
* varobj.h (varobjdebug): ...here, and declare.
diff --git a/gdb/main.c b/gdb/main.c
index 14d9e79..7f87363 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -48,6 +48,9 @@
#include <vector>
#include "gdbsupport/pathstuff.h"
#include "cli/cli-style.h"
+#ifdef GDBTK
+#include "gdbtk/generic/gdbtk.h"
+#endif
/* The selected interpreter. This will be used as a set command
variable, so it should always be malloc'ed - since
@@ -764,8 +767,6 @@ captured_main_1 (struct captured_main_args *context)
#ifdef GDBTK
case 'z':
{
- extern int gdbtk_test (char *);
-
if (!gdbtk_test (optarg))
error (_("%s: unable to load tclcommand file \"%s\""),
gdb_program_name, optarg);
@@ -778,8 +779,6 @@ captured_main_1 (struct captured_main_args *context)
{
/* Set the external editor commands when gdb is farming out files
to be edited by another program. */
- extern char *external_editor_command;
-
external_editor_command = xstrdup (optarg);
break;
}