2002-11-04 Elena Zannoni <ezannoni@redhat.com>

	* interps.h (clear_interpreter_hooks): Add 'extern' keyword.

2002-11-04  Elena Zannoni  <ezannoni@redhat.com>

	* mi.h: Clean up interface, removing unnecessarily exported
	functions and data structures.
	* mi-events.c (mi_event_handlers): Move here...
	* mi-interps.c: .. from here.
	Include gdb_string.h.

6 files changed, 35 insertions, 39 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 29e0fac0701..b01ea106b28 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
 
+	* interps.h (clear_interpreter_hooks): Add 'extern' keyword.
+
+2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
+
 	* cli/cli-interp.c (_initialize_cli_interp): Call
 	gdb_interpreter_new and gdb_interpreter_add.
 	* top.c (gdb_init): Call gdb_interpreter_lookup.
@@ -13,6 +17,7 @@
 	Update all callers.
 	* interps.h: Ditto.
 	
+
 2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
 
 	* interps.h (gdb_interpreter_is_quiet_p): Rename from
diff --git a/gdb/interps.h b/gdb/interps.h
index 4abc8d7a262..21a0279d2c7 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -57,7 +57,7 @@ extern struct gdb_interpreter_procs *gdb_interpreter_get_procs (struct
 								*interp);
 extern void *gdb_interpreter_get_data (struct gdb_interpreter *interp);
 
-void clear_interpreter_hooks ();
+extern void clear_interpreter_hooks ();
 
 /* well-known interpreters */
 #define GDB_INTERPRETER_CONSOLE		"console"
diff --git a/gdb/mi/ChangeLog b/gdb/mi/ChangeLog
index 79747a82bdc..7936774b2c6 100644
--- a/gdb/mi/ChangeLog
+++ b/gdb/mi/ChangeLog
@@ -1,5 +1,13 @@
 2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
 
+	* mi.h: Clean up interface, removing unnecessarily exported
+	functions and data structures.
+	* mi-events.c (mi_event_handlers): Move here...
+	* mi-interps.c: .. from here.
+	Include gdb_string.h.
+	
+2002-11-04  Elena Zannoni  <ezannoni@redhat.com>
+
 	* mi-interp.c (mi_interpreter_resume): Ditto.
 	(mi_cmd_interpreter_exec): Use gdb_interpreter_lookup.
 	(_initialize_mi_interp): Use gdb_interpreter_new,
@@ -9,6 +17,8 @@
 	(mi_cmd_break_watch): Ditto.
 	* mi-events.c (mi_interp_stack_changed_hook): Ditto.
 	(event_notify): Ditto.
+	
+
 	* mi-main.c (captured_mi_execute_command): Use
 	gdb_interpreter_current_is_named_p.
 	(mi_load_progress): Ditto.
diff --git a/gdb/mi/mi-events.c b/gdb/mi/mi-events.c
index 876bf8a3d57..2788584bbbf 100644
--- a/gdb/mi/mi-events.c
+++ b/gdb/mi/mi-events.c
@@ -118,3 +118,18 @@ mi_context_changed (int thread_id)
 {
   event_notify ("context-changed,thread=\"%d\"", thread_id);
 }
+
+struct gdb_events mi_event_handlers =
+  {
+    mi_create_breakpoint,
+    mi_delete_breakpoint,
+    mi_modify_breakpoint,
+    mi_create_tracepoint,
+    mi_delete_tracepoint,
+    mi_modify_tracepoint,
+    mi_architecture_changed,
+    mi_target_changed,
+    mi_selected_frame_level_changed,
+    mi_context_changed
+  };
+
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index ca8758d852d..456e42d21ee 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -19,6 +19,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
+#include "gdb_string.h"
 #include "interps.h"
 #include "event-top.h"
 #include "event-loop.h"
@@ -67,20 +68,6 @@ static void mi1_command_loop (void);
 static void mi_insert_notify_hooks (void);
 static void mi_remove_notify_hooks (void);
 
-static struct gdb_events mi_event_handlers =
-  {
-    mi_create_breakpoint,
-    mi_delete_breakpoint,
-    mi_modify_breakpoint,
-    mi_create_tracepoint,
-    mi_delete_tracepoint,
-    mi_modify_tracepoint,
-    mi_architecture_changed,
-    mi_target_changed,
-    mi_selected_frame_level_changed,
-    mi_context_changed
-  };
-
 static int
 mi_interpreter_init (void *data)
 {
diff --git a/gdb/mi/mi.h b/gdb/mi/mi.h
index be4e63344d8..b553d56c9b2 100644
--- a/gdb/mi/mi.h
+++ b/gdb/mi/mi.h
@@ -21,39 +21,18 @@
 #ifndef MI_H
 #define MI_H
 /* The mi interpreters. */
-struct ui_file;
-struct breakpoint;
-struct gdb_interpreter;
+
 extern struct gdb_interpreter *mi_interp;
 extern struct gdb_interpreter *mi1_interp;
+extern struct gdb_events mi_event_handlers;
+extern struct ui_file *mi_event_channel;
 
 extern void mi_setup_architecture_data (void);
 extern void mi_register_gdbarch_swap (void);
 
-/* MI's output channels */
-extern struct ui_file *mi_stdout;
-extern struct ui_file *mi_stderr;
-extern struct ui_file *mi_stdlog;
-extern struct ui_file *mi_stdtarg;
-extern struct ui_file *mi_event_channel;
-
-/* Events/Hooks */
 extern void mi_load_progress (const char *section_name,
 			      unsigned long sent_so_far,
 			      unsigned long total_section,
 			      unsigned long total_sent,
 			      unsigned long grand_total);
-extern void mi_interp_frame_changed_hook (int new_frame_number);
-extern void mi_interp_context_hook (int thread_id);
-
-extern void mi_create_breakpoint (int bpnum);
-extern void mi_modify_breakpoint (int bpnum);
-extern void mi_delete_breakpoint (int bpnum);
-extern void mi_create_tracepoint (int bpnum);
-extern void mi_modify_tracepoint (int bpnum);
-extern void mi_delete_tracepoint (int bpnum);
-extern void mi_architecture_changed (void);
-extern void mi_target_changed (void);
-extern void mi_selected_frame_level_changed (int level);
-extern void mi_context_changed (int thread_id);
 #endif /* MI_H */