This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[FYI 2/3] remove use_windows
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tromey at redhat dot com>
- Date: Mon, 13 Jan 2014 14:31:54 -0700
- Subject: [FYI 2/3] remove use_windows
- Authentication-results: sourceware.org; auth=none
- References: <1389648715-22041-1-git-send-email-tromey at redhat dot com>
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.
---
gdb/ChangeLog | 8 ++++++++
gdb/defs.h | 4 ----
gdb/gdb.c | 1 -
gdb/main.c | 13 -------------
gdb/main.h | 1 -
gdb/top.c | 5 -----
6 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/gdb/defs.h b/gdb/defs.h
index 7a7d474..d86f4a9 100644
--- 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 e708b34..78cfb12 100644
--- 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 0c8349e..efb49f5 100644
--- 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 cc97bcb..089e1c8 100644
--- 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 d5ef034..f92043d 100644
--- 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
--
1.8.1.4