gdb/

	Code cleanup.
	* main.c (write_files): Remove the declaration.
	(external_editor_command): Move the declaration ...
	[GDBTK] (external_editor_command): ... here.  Fix the comment.

2 files changed, 11 insertions, 7 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3a0d0d0..48a4389 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-20  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Code cleanup.
+	* main.c (write_files): Remove the declaration.
+	(external_editor_command): Move the declaration ...
+	[GDBTK] (external_editor_command): ... here.  Fix the comment.
+
 2012-02-20  Tom Tromey  <tromey@redhat.com>
 
 	* dwarf2read.c (dw2_map_symtabs_matching_filename): Remove
diff --git a/gdb/main.c b/gdb/main.c
index 8b45c25..e46f823 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -84,19 +84,12 @@ int batch_silent = 0;
 int return_child_result = 0;
 int return_child_result_value = -1;
 
-/* Whether to enable writing into executable and core files.  */
-extern int write_files;
 
 /* GDB as it has been invoked from the command line (i.e. argv[0]).  */
 static char *gdb_program_name;
 
 static void print_gdb_help (struct ui_file *);
 
-/* These two are used to set the external editor commands when gdb is
-   farming out files to be edited by another program.  */
-
-extern char *external_editor_command;
-
 /* Relocate a file or directory.  PROGNAME is the name by which gdb
    was invoked (i.e., argv[0]).  INITIAL is the default value for the
    file or directory.  FLAG is true if the value is relocatable, false
@@ -588,6 +581,10 @@ captured_main (void *data)
 	    break;
 	  case 'w':
 	    {
+	      /* 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;
 	    }