remove use_windows

Nothing actually uses use_windows, not even Insight.  So, this patch
removes it.

2014-01-13  Tom Tromey  <tromey@redhat.com>

	* defs.h (use_windows): Remove.
	* gdb.c (main): Update.
	* main.c (captured_main, gdb_main): Update.
	* main.h (struct captured_main_args) <use_windows>: Remove.
	* top.c (use_windows): Remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5e3975f409e1910c4be1d8932610c3eb21f7d131..7e347ef903efebfbd2033a94d64d4d3e78033710 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-01-13  Tom Tromey  <tromey@redhat.com>
+
+       * defs.h (use_windows): Remove.
+       * gdb.c (main): Update.
+       * main.c (captured_main, gdb_main): Update.
+       * main.h (struct captured_main_args) <use_windows>: Remove.
+       * top.c (use_windows): Remove.
+
 2014-01-13  Tom Tromey  <tromey@redhat.com>
 
        * defs.h (deprecated_flush_hook): Remove.

diff --git a/gdb/defs.h b/gdb/defs.h
index 7a7d47412fc1455bf826e33a7f20443e638d34e1..d86f4a9b096f22e25f36929276ecbee4030badd7 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -729,10 +729,6 @@ extern void (*deprecated_call_command_hook) (struct cmd_list_element * c,
 extern int (*deprecated_ui_load_progress_hook) (const char *section,
                                                unsigned long num);
 
-/* Inhibit window interface if non-zero.  */
-
-extern int use_windows;
-
 /* If this definition isn't overridden by the header files, assume
    that isatty and fileno exist on this system.  */
 #ifndef ISATTY

diff --git a/gdb/gdb.c b/gdb/gdb.c
index e708b340a0276d658fcddd301ed1e7ac867ddefc..78cfb121b392e18eeebc6fe210875bdf21079a50 100644 (file)
--- a/gdb/gdb.c
+++ b/gdb/gdb.c
@@ -29,7 +29,6 @@ main (int argc, char **argv)
   memset (&args, 0, sizeof args);
   args.argc = argc;
   args.argv = argv;
-  args.use_windows = 0;
   args.interpreter_p = INTERP_CONSOLE;
   return gdb_main (&args);
 }

diff --git a/gdb/main.c b/gdb/main.c
index 0c8349e1f62849329b76240ac98156e3dc4370b8..efb49f5d61d29ff9e13743b4d0164f076f5a45ea 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -588,19 +588,14 @@ captured_main (void *data)
            xfree (interpreter_p);
            interpreter_p = xstrdup (INTERP_INSIGHT);
 #endif
-           use_windows = 1;
            break;
          case OPT_NOWINDOWS:
            /* -nw is equivalent to -i=console.  */
            xfree (interpreter_p);
            interpreter_p = xstrdup (INTERP_CONSOLE);
-           use_windows = 0;
            break;
          case 'f':
            annotation_level = 1;
-           /* We have probably been invoked from emacs.  Disable
-              window interface.  */
-           use_windows = 0;
            break;
          case 's':
            symarg = optarg;
@@ -744,13 +739,6 @@ captured_main (void *data)
          }
       }
 
-    /* If --help or --version or --configuration, disable window
-       interface.  */
-    if (print_help || print_version || print_configuration)
-      {
-       use_windows = 0;
-      }
-
     if (batch_flag)
       quiet = 1;
   }
@@ -1072,7 +1060,6 @@ captured_main (void *data)
 int
 gdb_main (struct captured_main_args *args)
 {
-  use_windows = args->use_windows;
   catch_errors (captured_main, args, "", RETURN_MASK_ALL);
   /* The only way to end up here is by an error (normal exit is
      handled by quit_force()), hence always return an error status.  */

diff --git a/gdb/main.h b/gdb/main.h
index cc97bcb58567344bbccd794fe248f6bb956dd887..089e1c8e4f591a378db34a198d186261aa772d61 100644 (file)
--- a/gdb/main.h
+++ b/gdb/main.h
@@ -24,7 +24,6 @@ struct captured_main_args
 {
   int argc;
   char **argv;
-  int use_windows;
   const char *interpreter_p;
 };
 

diff --git a/gdb/top.c b/gdb/top.c
index d5ef034e6347bdace40b53aaf859ecd2e09a7cd4..f92043d523c6cf9653b133be33088823b1071018 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -86,11 +86,6 @@ const char gdbinit[] = GDBINIT;
 
 int inhibit_gdbinit = 0;
 
-/* If nonzero, and GDB has been configured to be able to use windows,
-   attempt to open them upon startup.  */
-
-int use_windows = 0;
-
 extern char lang_frame_mismatch_warn[];                /* language.c */
 
 /* Flag for whether we want to confirm potentially dangerous