2008-03-14  Pedro Alves  <pedro@codesourcery.com>

	revert:
	2008-03-14  Pedro Alves  <pedro@codesourcery.com>
	* inf-loop.c (inferior_event_handler): Don't include remote.h.
	Call target_stop in the INF_QUIT_REQ case.
	* Makefile.in (inf-loop.o): Update.

---
 gdb/Makefile.in |    2 +-
 gdb/inf-loop.c  |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

Index: src/gdb/Makefile.in
===================================================================
--- src.orig/gdb/Makefile.in	2008-03-14 15:09:18.000000000 +0000
+++ src/gdb/Makefile.in	2008-03-14 15:09:34.000000000 +0000
@@ -2293,7 +2293,7 @@ infcmd.o: infcmd.c $(defs_h) $(gdb_strin
 	$(solib_h) $(gdb_assert_h) $(observer_h) $(target_descriptions_h) \
 	$(user_regs_h)
 inf-loop.o: inf-loop.c $(defs_h) $(inferior_h) $(target_h) $(event_loop_h) \
-	$(event_top_h) $(inf_loop_h) $(exceptions_h)
+	$(event_top_h) $(inf_loop_h) $(remote_h) $(exceptions_h)
 inflow.o: inflow.c $(defs_h) $(frame_h) $(inferior_h) $(command_h) \
 	$(serial_h) $(terminal_h) $(target_h) $(gdbthread_h) $(gdb_string_h) \
 	$(inflow_h) $(gdb_select_h)
Index: src/gdb/inf-loop.c
===================================================================
--- src.orig/gdb/inf-loop.c	2008-03-14 15:09:15.000000000 +0000
+++ src/gdb/inf-loop.c	2008-03-14 15:09:34.000000000 +0000
@@ -23,6 +23,7 @@
 #include "event-loop.h"
 #include "event-top.h"
 #include "inf-loop.h"
+#include "remote.h"
 #include "exceptions.h"
 
 static int fetch_inferior_event_wrapper (gdb_client_data client_data);
@@ -82,8 +83,11 @@ inferior_event_handler (enum inferior_ev
       do_all_intermediate_continuations ();
       break;
 
-    case INF_QUIT_REQ:
-      target_stop ();
+    case INF_QUIT_REQ: 
+      /* FIXME: ezannoni 1999-10-04. This call should really be a
+	 target vector entry, so that it can be used for any kind of
+	 targets. */
+      async_remote_interrupt_twice (NULL);
       break;
 
     case INF_TIMER: