2004-06-26 Andrew Cagney <cagney@gnu.org>

	* gdb-events.sh (deprecated_set_gdb_event_hooks): Deprecated.
	* gdb-events.h, gdb-events.c: Re-generate.
	* tui/tui-hooks.c (tui_install_hooks): Update.
	(tui_remove_hooks): Update.
	* mi/mi-cmd-break.c (mi_cmd_break_insert): Update.

6 files changed, 18 insertions, 10 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f3668166793..d1e78390bca 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-26  Andrew Cagney  <cagney@gnu.org>
+
+	* gdb-events.sh (deprecated_set_gdb_event_hooks): Deprecated.
+	* gdb-events.h, gdb-events.c: Re-generate.
+	* tui/tui-hooks.c (tui_install_hooks): Update.
+	(tui_remove_hooks): Update.
+	* mi/mi-cmd-break.c (mi_cmd_break_insert): Update.
+
 2004-06-26  Mark Kettenis  <kettenis@gnu.org>
 
 	* amd64fbsd-nat.c: Don't include <sys/procfs.h> and "gregset.h".
diff --git a/gdb/gdb-events.c b/gdb/gdb-events.c
index d61409fffdf..e0916d8706f 100644
--- a/gdb/gdb-events.c
+++ b/gdb/gdb-events.c
@@ -116,7 +116,7 @@ architecture_changed_event (void)
 }
 
 struct gdb_events *
-set_gdb_event_hooks (struct gdb_events *vector)
+deprecated_set_gdb_event_hooks (struct gdb_events *vector)
 {
   struct gdb_events *old_events = current_event_hooks;
   if (vector == NULL)
@@ -129,7 +129,7 @@ set_gdb_event_hooks (struct gdb_events *vector)
 void
 clear_gdb_event_hooks (void)
 {
-  set_gdb_event_hooks (&null_event_hooks);
+  deprecated_set_gdb_event_hooks (&null_event_hooks);
 }
 
 enum gdb_event
diff --git a/gdb/gdb-events.h b/gdb/gdb-events.h
index c8d55302180..386250b5450 100644
--- a/gdb/gdb-events.h
+++ b/gdb/gdb-events.h
@@ -83,7 +83,7 @@ extern void tracepoint_modify_event (int number);
 extern void architecture_changed_event (void);
 
 /* Install custom gdb-events hooks. */
-extern struct gdb_events *set_gdb_event_hooks (struct gdb_events *vector);
+extern struct gdb_events *deprecated_set_gdb_event_hooks (struct gdb_events *vector);
 
 /* Deliver any pending events. */
 extern void gdb_events_deliver (struct gdb_events *vector);
diff --git a/gdb/gdb-events.sh b/gdb/gdb-events.sh
index c16a8990327..5be1e54cdfd 100755
--- a/gdb/gdb-events.sh
+++ b/gdb/gdb-events.sh
@@ -177,7 +177,7 @@ done
 cat <<EOF
 
 /* Install custom gdb-events hooks. */
-extern struct gdb_events *set_gdb_event_hooks (struct gdb_events *vector);
+extern struct gdb_events *deprecated_set_gdb_event_hooks (struct gdb_events *vector);
 
 /* Deliver any pending events. */
 extern void gdb_events_deliver (struct gdb_events *vector);
@@ -265,7 +265,7 @@ done
 echo ""
 cat <<EOF
 struct gdb_events *
-set_gdb_event_hooks (struct gdb_events *vector)
+deprecated_set_gdb_event_hooks (struct gdb_events *vector)
 {
   struct gdb_events *old_events = current_event_hooks;
   if (vector == NULL)
@@ -292,7 +292,7 @@ cat <<EOF
 void
 clear_gdb_event_hooks (void)
 {
-  set_gdb_event_hooks (&null_event_hooks);
+  deprecated_set_gdb_event_hooks (&null_event_hooks);
 }
 EOF
 
diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
index 5d15aa98b8a..528cd3c9d3e 100644
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -134,7 +134,7 @@ mi_cmd_break_insert (char *command, char **argv, int argc)
   address = argv[optind];
 
   /* Now we have what we need, let's insert the breakpoint! */
-  old_hooks = set_gdb_event_hooks (&breakpoint_hooks);
+  old_hooks = deprecated_set_gdb_event_hooks (&breakpoint_hooks);
   switch (type)
     {
     case REG_BP:
@@ -160,7 +160,7 @@ mi_cmd_break_insert (char *command, char **argv, int argc)
       internal_error (__FILE__, __LINE__,
 		      "mi_cmd_break_insert: Bad switch.");
     }
-  set_gdb_event_hooks (old_hooks);
+  deprecated_set_gdb_event_hooks (old_hooks);
 
   if (rc == GDB_RC_FAIL)
     return MI_CMD_CAUGHT_ERROR;
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index 6f880aba994..64bcb996d87 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -290,7 +290,7 @@ tui_install_hooks (void)
   deprecated_query_hook = tui_query_hook;
 
   /* Install the event hooks.  */
-  tui_old_event_hooks = set_gdb_event_hooks (&tui_event_hooks);
+  tui_old_event_hooks = deprecated_set_gdb_event_hooks (&tui_event_hooks);
 
   deprecated_registers_changed_hook = tui_registers_changed_hook;
   deprecated_register_changed_hook = tui_register_changed_hook;
@@ -310,7 +310,7 @@ tui_remove_hooks (void)
   deprecated_detach_hook = 0;
 
   /* Restore the previous event hooks.  */
-  set_gdb_event_hooks (tui_old_event_hooks);
+  deprecated_set_gdb_event_hooks (tui_old_event_hooks);
 }
 
 void _initialize_tui_hooks (void);