summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faylor <me+cygwin@cgf.cx>2003-02-17 18:41:29 +0000
committerChristopher Faylor <me+cygwin@cgf.cx>2003-02-17 18:41:29 +0000
commit4e1dab7d1757e4f9555323877a68a7b6c277b53a (patch)
tree67460439320b518c06170d75f1ae3941daf84b0b
parent47c99471da461c3d68c96e44e04eca2c1a352f87 (diff)
downloadgdb-4e1dab7d1757e4f9555323877a68a7b6c277b53a.tar.gz
* gdbtk/gdbtk.c (tk_procs): Make file global. Declare at top.
(_initialize_gdbtk): Move interp_add from here. (gdb_tk): Call interp_add here. Pass correct uiout to interp_new.
-rw-r--r--gdb/gdbtk/ChangeLog6
-rw-r--r--gdb/gdbtk/generic/gdbtk.c23
2 files changed, 17 insertions, 12 deletions
diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index 943d585b558..46018c108da 100644
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-17 Christopher Faylor <cgf@redhat.com>
+
+ * gdbtk/gdbtk.c (tk_procs): Make file global. Declare at top.
+ (_initialize_gdbtk): Move interp_add from here.
+ (gdb_tk): Call interp_add here. Pass correct uiout to interp_new.
+
2003-02-14 Keith Seitz <keiths@redhat.com>
From Chris Faylor <cgf@redhat.com>:
diff --git a/gdb/gdbtk/generic/gdbtk.c b/gdb/gdbtk/generic/gdbtk.c
index 3fb975b04f0..fe244891288 100644
--- a/gdb/gdbtk/generic/gdbtk.c
+++ b/gdb/gdbtk/generic/gdbtk.c
@@ -69,6 +69,7 @@ extern void _initialize_gdbtk (void);
static sigset_t nullsigmask;
static struct sigaction act1, act2;
static struct itimerval it_on, it_off;
+static const struct interp_procs tk_procs;
static void
x_event_wrapper (int signo)
@@ -593,6 +594,7 @@ gdbtk_init (char *argv0)
gdb_stdlog = gdbtk_fileopen ();
gdb_stdtarg = gdbtk_fileopen ();
uiout = cli_out_new (gdb_stdout);
+ interp_add (interp_new ("gdbtk", NULL, uiout, &tk_procs));
#ifdef __CYGWIN32__
(void) FreeConsole ();
@@ -749,22 +751,19 @@ gdbtk_command_loop (void *data)
}
/* Come here during initialize_all_files () */
+static const struct interp_procs tk_procs =
+{
+ tk_init,
+ gdbtk_resume,
+ gdbtk_suspend,
+ gdbtk_exec,
+ gdbtk_prompt_p,
+ gdbtk_command_loop,
+};
void
_initialize_gdbtk ()
{
- static const struct interp_procs tk_procs =
- {
- tk_init,
- gdbtk_resume,
- gdbtk_suspend,
- gdbtk_exec,
- gdbtk_prompt_p,
- gdbtk_command_loop,
- };
-
- interp_add (interp_new ("gdbtk", NULL, NULL, &tk_procs));
-
/* FIXME: cagney/2003-02-12: This is wrong. The initialization
should be done via the init function. */
if (use_windows)