From: Christian Biesinger <cbiesinger@google.com>
Date: Thu, 10 Oct 2019 17:42:41 +0000 (-0500)
Subject: Include gdbtk.h to avoid declarations
X-Git-Tag: binutils-2_34~1067
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26344e0c532379477be3a203c80722051521a55e;p=thirdparty%2Fbinutils-gdb.git

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.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2abae432dfe..fba57f3469b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/gdb/main.c b/gdb/main.c
index 14d9e796538..7f873630d63 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;
 	    }