NOTE: This needs fixing. Shouldn't be difficult, but it will be tedious.

        * generic/gdbtk-hooks.c (gdbtk_add_hooks): "Update" deprecated hooks.
        "Houston... We have a problem."
        * generic/gdbtk-interp.c (gdbtk_interpreter_resume): Likewise.
        * generic/gdbtk.c (gdbtk_init_1): Likewise.

diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index 45cef71..f745834 100644 (file)
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-22  Keith Seitz  <kseitz@sources.redhat.com>
+
+       * generic/gdbtk-hooks.c (gdbtk_add_hooks): "Update" deprecated hooks.
+       "Houston... We have a problem."
+       * generic/gdbtk-interp.c (gdbtk_interpreter_resume): Likewise.
+       * generic/gdbtk.c (gdbtk_init_1): Likewise.
+       
 2004-04-19  Roland McGrath  <roland@redhat.com>
 
        * generic/gdbtk-hooks.c: Update gdbtk_pre_add_symbol forward decl to

diff --git a/gdb/gdbtk/generic/gdbtk-hooks.c b/gdb/gdbtk/generic/gdbtk-hooks.c
index 87f0244..6499a51 100644 (file)
--- a/gdb/gdbtk/generic/gdbtk-hooks.c
+++ b/gdb/gdbtk/generic/gdbtk-hooks.c
@@ -1,6 +1,6 @@
 /* Startup code for Insight.
 
-   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 200, 2002, 2003 Free
+   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 200, 2002, 2003, 2004 Free
    Software Foundation, Inc.
 
    Written by Stu Grossman <grossman@cygnus.com> of Cygnus Support.
@@ -134,41 +134,41 @@ gdbtk_add_hooks (void)
   set_gdb_event_hooks (&handlers);
 
   /* Hooks */
-  call_command_hook = gdbtk_call_command;
-  set_hook = gdbtk_set_hook;
-  readline_begin_hook = gdbtk_readline_begin;
-  readline_hook = gdbtk_readline;
-  readline_end_hook = gdbtk_readline_end;
+  deprecated_call_command_hook = gdbtk_call_command;
+  deprecated_set_hook = gdbtk_set_hook;
+  deprecated_readline_begin_hook = gdbtk_readline_begin;
+  deprecated_readline_hook = gdbtk_readline;
+  deprecated_readline_end_hook = gdbtk_readline_end;
 
-  print_frame_info_listing_hook = gdbtk_print_frame_info;
-  query_hook = gdbtk_query;
-  warning_hook = gdbtk_warning;
+  deprecated_print_frame_info_listing_hook = gdbtk_print_frame_info;
+  deprecated_query_hook = gdbtk_query;
+  deprecated_warning_hook = gdbtk_warning;
 
-  interactive_hook = gdbtk_interactive;
-  target_wait_hook = gdbtk_wait;
-  ui_load_progress_hook = gdbtk_load_hash;
+  deprecated_interactive_hook = gdbtk_interactive;
+  deprecated_target_wait_hook = gdbtk_wait;
+  deprecated_ui_load_progress_hook = gdbtk_load_hash;
 
   ui_loop_hook = x_event;
   pre_add_symbol_hook = gdbtk_pre_add_symbol;
   post_add_symbol_hook = gdbtk_post_add_symbol;
-  file_changed_hook = gdbtk_file_changed;
+  deprecated_file_changed_hook = gdbtk_file_changed;
   specify_exec_file_hook (gdbtk_exec_file_display);
 
-  trace_find_hook = gdbtk_trace_find;
-  trace_start_stop_hook = gdbtk_trace_start_stop;
+  deprecated_trace_find_hook = gdbtk_trace_find;
+  deprecated_trace_start_stop_hook = gdbtk_trace_start_stop;
 
-  attach_hook            = gdbtk_attach;
-  detach_hook            = gdbtk_detach;
+  deprecated_attach_hook            = gdbtk_attach;
+  deprecated_detach_hook            = gdbtk_detach;
 
-  register_changed_hook = gdbtk_register_changed;
-  memory_changed_hook = gdbtk_memory_changed;
-  selected_frame_level_changed_hook = gdbtk_selected_frame_changed;
-  context_hook = gdbtk_context_change;
+  deprecated_register_changed_hook = gdbtk_register_changed;
+  deprecated_memory_changed_hook = gdbtk_memory_changed;
+  deprecated_selected_frame_level_changed_hook = gdbtk_selected_frame_changed;
+  deprecated_context_hook = gdbtk_context_change;
 
-  error_begin_hook = gdbtk_error_begin;
+  deprecated_error_begin_hook = gdbtk_error_begin;
 
-  annotate_signal_hook = gdbtk_annotate_signal;
-  annotate_signalled_hook = gdbtk_annotate_signal;
+  deprecated_annotate_signal_hook = gdbtk_annotate_signal;
+  deprecated_annotate_signalled_hook = gdbtk_annotate_signal;
 }
 
 /* These control where to put the gdb output which is created by

diff --git a/gdb/gdbtk/generic/gdbtk-interp.c b/gdb/gdbtk/generic/gdbtk-interp.c
index 1fc1b64..8929f88 100644 (file)
--- a/gdb/gdbtk/generic/gdbtk-interp.c
+++ b/gdb/gdbtk/generic/gdbtk-interp.c
@@ -1,7 +1,7 @@
 /* Insight Definitions for GDB, the GNU debugger.
-   Written by Keith Seitz <kseitz@uglyboxes.com>
+   Written by Keith Seitz <kseitz@sources.redhat.com>
 
-   Copyright 2003 Free Software Foundation, Inc.
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of Insight.
 
@@ -83,7 +83,7 @@ gdbtk_interpreter_resume (void *data)
   gdb_stdlog = d->_stdlog;
   gdb_stdtarg = d->_stdtarg;
 
-  command_loop_hook = gdbtk_command_loop;
+  deprecated_command_loop_hook = gdbtk_command_loop;
 
   /* 2003-02-11 keiths: We cannot actually source our main Tcl file in
      our interpreter's init function because any errors that may

diff --git a/gdb/gdbtk/generic/gdbtk.c b/gdb/gdbtk/generic/gdbtk.c
index 2b6decf..1677d37 100644 (file)
--- a/gdb/gdbtk/generic/gdbtk.c
+++ b/gdb/gdbtk/generic/gdbtk.c
@@ -1,5 +1,5 @@
 /* Startup code for Insight
-   Copyright 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003
+   Copyright 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
    Written by Stu Grossman <grossman@cygnus.com> of Cygnus Support.
@@ -658,7 +658,7 @@ static void
 gdbtk_init_1 (char *arg0)
 {
   argv0 = arg0;
-  init_ui_hook = NULL;
+  deprecated_init_ui_hook = NULL;
 }
 
 /* gdbtk_test is used in main.c to validate the -tclcommand option to
@@ -684,7 +684,7 @@ _initialize_gdbtk ()
      if "interpreter_p" is set to "insight" to know if
      insight is GOING to run. */
   if (strcmp (interpreter_p, "insight") == 0)
-    init_ui_hook = gdbtk_init_1;
+    deprecated_init_ui_hook = gdbtk_init_1;
 #ifdef __CYGWIN__
   else
     {