From cc4349edfd544f63fe931d25f50f79bf1a5747f4 Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Mon, 7 Nov 2005 12:46:38 +0000 Subject: [PATCH] 2005-11-07 Andrew Stubbs * main.c (main): Use INTERP_TUI instead of "tui". Set interpreter to INTERP_INSIGHT when '-w' given. * interps.h (INTERP_INSIGHT): New define. * tui/tui-interp.c (_initialize_tui_interp): Use INTERP_TUI instead of "tui". --- gdb/interps.h | 1 + gdb/main.c | 7 ++++++- gdb/tui/tui-interp.c | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gdb/interps.h b/gdb/interps.h index 858c1e44309..4d0250e3b48 100644 --- a/gdb/interps.h +++ b/gdb/interps.h @@ -76,5 +76,6 @@ extern void clear_interpreter_hooks (void); #define INTERP_MI3 "mi3" #define INTERP_MI "mi" #define INTERP_TUI "tui" +#define INTERP_INSIGHT "insight" #endif diff --git a/gdb/main.c b/gdb/main.c index 486b0ac5782..05d1d5fff90 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -350,11 +350,16 @@ captured_main (void *data) case OPT_TUI: /* --tui is equivalent to -i=tui. */ xfree (interpreter_p); - interpreter_p = xstrdup ("tui"); + interpreter_p = xstrdup (INTERP_TUI); break; case OPT_WINDOWS: /* FIXME: cagney/2003-03-01: Not sure if this option is actually useful, and if it is, what it should do. */ +#ifdef GDBTK + /* --windows is equivalent to -i=insight. */ + xfree (interpreter_p); + interpreter_p = xstrdup (INTERP_INSIGHT); +#endif use_windows = 1; break; case OPT_NOWINDOWS: diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c index 17dda51d8ca..aeb204740b8 100644 --- a/gdb/tui/tui-interp.c +++ b/gdb/tui/tui-interp.c @@ -199,13 +199,13 @@ _initialize_tui_interp (void) /* Create a default uiout builder for the TUI. */ tui_out = tui_out_new (gdb_stdout); - interp_add (interp_new ("tui", NULL, tui_out, &procs)); - if (interpreter_p && strcmp (interpreter_p, "tui") == 0) + interp_add (interp_new (INTERP_TUI, NULL, tui_out, &procs)); + if (interpreter_p && strcmp (interpreter_p, INTERP_TUI) == 0) tui_start_enabled = 1; if (interpreter_p && strcmp (interpreter_p, INTERP_CONSOLE) == 0) { xfree (interpreter_p); - interpreter_p = xstrdup ("tui"); + interpreter_p = xstrdup (INTERP_TUI); } } -- 2.30.2