1 files changed, 13 insertions, 108 deletions

diff --git a/gdb/gdb-events.c b/gdb/gdb-events.c
index 63ee3bc400b..42d93bfb020 100644
--- a/gdb/gdb-events.c
+++ b/gdb/gdb-events.c
@@ -1,6 +1,6 @@
 /* User Interface Events.
 
-   Copyright 1999, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 1999, 2001, 2002, 2004 Free Software Foundation, Inc.
 
    Contributed by Cygnus Solutions.
 
@@ -39,16 +39,12 @@
 #include "gdb-events.h"
 #include "gdbcmd.h"
 
-#if WITH_GDB_EVENTS
 static struct gdb_events null_event_hooks;
 static struct gdb_events queue_event_hooks;
 static struct gdb_events *current_event_hooks = &null_event_hooks;
-#endif
 
 int gdb_events_debug;
 
-#if WITH_GDB_EVENTS
-
 void
 breakpoint_create_event (int b)
 {
@@ -119,41 +115,8 @@ architecture_changed_event (void)
   current_event_hooks->architecture_changed ();
 }
 
-void
-target_changed_event (void)
-{
-  if (gdb_events_debug)
-    fprintf_unfiltered (gdb_stdlog, "target_changed_event\n");
-  if (!current_event_hooks->target_changed)
-    return;
-  current_event_hooks->target_changed ();
-}
-
-void
-selected_frame_level_changed_event (int level)
-{
-  if (gdb_events_debug)
-    fprintf_unfiltered (gdb_stdlog, "selected_frame_level_changed_event\n");
-  if (!current_event_hooks->selected_frame_level_changed)
-    return;
-  current_event_hooks->selected_frame_level_changed (level);
-}
-
-void
-selected_thread_changed_event (int thread_num)
-{
-  if (gdb_events_debug)
-    fprintf_unfiltered (gdb_stdlog, "selected_thread_changed_event\n");
-  if (!current_event_hooks->selected_thread_changed)
-    return;
-  current_event_hooks->selected_thread_changed (thread_num);
-}
-
-#endif
-
-#if WITH_GDB_EVENTS
 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)
@@ -162,15 +125,12 @@ set_gdb_event_hooks (struct gdb_events *vector)
     current_event_hooks = vector;
   return old_events;
 }
-#endif
 
-#if WITH_GDB_EVENTS
 void
 clear_gdb_event_hooks (void)
 {
-  set_gdb_event_hooks (&null_event_hooks);
+  deprecated_set_gdb_event_hooks (&null_event_hooks);
 }
-#endif
 
 enum gdb_event
 {
@@ -181,9 +141,6 @@ enum gdb_event
   tracepoint_delete,
   tracepoint_modify,
   architecture_changed,
-  target_changed,
-  selected_frame_level_changed,
-  selected_thread_changed,
   nr_gdb_events
 };
 
@@ -217,16 +174,6 @@ struct tracepoint_modify
     int number;
   };
 
-struct selected_frame_level_changed
-  {
-    int level;
-  };
-
-struct selected_thread_changed
-  {
-    int thread_num;
-  };
-
 struct event
   {
     enum gdb_event type;
@@ -239,8 +186,6 @@ struct event
 	struct tracepoint_create tracepoint_create;
 	struct tracepoint_delete tracepoint_delete;
 	struct tracepoint_modify tracepoint_modify;
-	struct selected_frame_level_changed selected_frame_level_changed;
-	struct selected_thread_changed selected_thread_changed;
       }
     data;
   };
@@ -319,32 +264,6 @@ queue_architecture_changed (void)
   append (event);
 }
 
-static void
-queue_target_changed (void)
-{
-  struct event *event = XMALLOC (struct event);
-  event->type = target_changed;
-  append (event);
-}
-
-static void
-queue_selected_frame_level_changed (int level)
-{
-  struct event *event = XMALLOC (struct event);
-  event->type = selected_frame_level_changed;
-  event->data.selected_frame_level_changed.level = level;
-  append (event);
-}
-
-static void
-queue_selected_thread_changed (int thread_num)
-{
-  struct event *event = XMALLOC (struct event);
-  event->type = selected_thread_changed;
-  event->data.selected_thread_changed.thread_num = thread_num;
-  append (event);
-}
-
 void
 gdb_events_deliver (struct gdb_events *vector)
 {
@@ -393,17 +312,6 @@ gdb_events_deliver (struct gdb_events *vector)
 	case architecture_changed:
 	  vector->architecture_changed ();
 	  break;
-	case target_changed:
-	  vector->target_changed ();
-	  break;
-	case selected_frame_level_changed:
-	  vector->selected_frame_level_changed
-	    (event->data.selected_frame_level_changed.level);
-	  break;
-	case selected_thread_changed:
-	  vector->selected_thread_changed
-	    (event->data.selected_thread_changed.thread_num);
-	  break;
 	}
       delivering_events = event->next;
       xfree (event);
@@ -415,7 +323,6 @@ void
 _initialize_gdb_events (void)
 {
   struct cmd_list_element *c;
-#if WITH_GDB_EVENTS
   queue_event_hooks.breakpoint_create = queue_breakpoint_create;
   queue_event_hooks.breakpoint_delete = queue_breakpoint_delete;
   queue_event_hooks.breakpoint_modify = queue_breakpoint_modify;
@@ -423,22 +330,20 @@ _initialize_gdb_events (void)
   queue_event_hooks.tracepoint_delete = queue_tracepoint_delete;
   queue_event_hooks.tracepoint_modify = queue_tracepoint_modify;
   queue_event_hooks.architecture_changed = queue_architecture_changed;
-  queue_event_hooks.target_changed = queue_target_changed;
-  queue_event_hooks.selected_frame_level_changed = queue_selected_frame_level_changed;
-  queue_event_hooks.selected_thread_changed = queue_selected_thread_changed;
-#endif
 
   c = add_set_cmd ("eventdebug", class_maintenance, var_zinteger,
 		   (char *) (&gdb_events_debug), "Set event debugging.\n\
 When non-zero, event/notify debugging is enabled.", &setlist);
   deprecate_cmd (c, "set debug event");
-  deprecate_cmd (add_show_from_set (c, &showlist), "show debug event");
-
-  add_show_from_set (add_set_cmd ("event",
-				  class_maintenance,
-				  var_zinteger,
-				  (char *) (&gdb_events_debug),
-				  "Set event debugging.\n\
+  deprecate_cmd (deprecated_add_show_from_set (c, &showlist),
+		 "show debug event");
+
+  deprecated_add_show_from_set
+    (add_set_cmd ("event",
+		  class_maintenance,
+		  var_zinteger,
+		  (char *) (&gdb_events_debug),
+		  "Set event debugging.\n\
 When non-zero, event/notify debugging is enabled.", &setdebuglist),
-		     &showdebuglist);
+     &showdebuglist);
 }