From f6fbab7d1b396b1ee576937b53bb0858c8f895d5 Mon Sep 17 00:00:00 2001
From: Yao Qi <yao@codesourcery.com>
Date: Tue, 23 Oct 2012 06:20:49 +0000
Subject: [PATCH] gdb/ 	* event-top.c (mark_async_signal_handler_wrapper):
 Remove. 	* event-top.h: Remove its declaration. 	(async_request_quit):
 Call mark_async_signal_handler instead of 
 mark_async_signal_handler_wrapper. 	(async_do_nothing, async_disconnect):
 Likewise. 	(async_stop_sig): Likewise. 	* remote.c
 (handle_remote_sigint): Likewise. 	(handle_remote_sigint_twice):
 Likewise.

---
 gdb/ChangeLog   | 11 +++++++++++
 gdb/event-top.c | 14 ++++----------
 gdb/event-top.h |  1 -
 gdb/remote.c    |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 308fa218fc..d27f64b14f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2012-10-23  Yao Qi  <yao@codesourcery.com>
+
+	* event-top.c (mark_async_signal_handler_wrapper): Remove.
+	* event-top.h: Remove its declaration.
+	(async_request_quit): Call mark_async_signal_handler instead of
+	mark_async_signal_handler_wrapper.
+	(async_do_nothing, async_disconnect): Likewise.
+	(async_stop_sig): Likewise.
+	* remote.c (handle_remote_sigint): Likewise.
+	(handle_remote_sigint_twice): Likewise.
+
 2012-10-23  Yao Qi  <yao@codesourcery.com>
 
 	* event-top.c (sigint_token, sighup_token): Replace 'void *'
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 1e0626a48e..5c533e4fe2 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -770,12 +770,6 @@ async_init_signals (void)
 
 }
 
-void
-mark_async_signal_handler_wrapper (void *token)
-{
-  mark_async_signal_handler ((struct async_signal_handler *) token);
-}
-
 /* Tell the event loop what to do if SIGINT is received.
    See event-signal.c.  */
 void
@@ -829,7 +823,7 @@ async_request_quit (gdb_client_data arg)
 static void
 handle_sigquit (int sig)
 {
-  mark_async_signal_handler_wrapper (sigquit_token);
+  mark_async_signal_handler (sigquit_token);
   signal (sig, handle_sigquit);
 }
 #endif
@@ -850,7 +844,7 @@ async_do_nothing (gdb_client_data arg)
 static void
 handle_sighup (int sig)
 {
-  mark_async_signal_handler_wrapper (sighup_token);
+  mark_async_signal_handler (sighup_token);
   signal (sig, handle_sighup);
 }
 
@@ -886,7 +880,7 @@ async_disconnect (gdb_client_data arg)
 void
 handle_stop_sig (int sig)
 {
-  mark_async_signal_handler_wrapper (sigtstp_token);
+  mark_async_signal_handler (sigtstp_token);
   signal (sig, handle_stop_sig);
 }
 
@@ -926,7 +920,7 @@ async_stop_sig (gdb_client_data arg)
 static void
 handle_sigfpe (int sig)
 {
-  mark_async_signal_handler_wrapper (sigfpe_token);
+  mark_async_signal_handler (sigfpe_token);
   signal (sig, handle_sigfpe);
 }
 
diff --git a/gdb/event-top.h b/gdb/event-top.h
index 76a790e613..76b24b84cd 100644
--- a/gdb/event-top.h
+++ b/gdb/event-top.h
@@ -46,7 +46,6 @@ extern void handle_stop_sig (int sig);
 extern void handle_sigint (int sig);
 extern void handle_sigterm (int sig);
 extern void gdb_readline2 (void *client_data);
-extern void mark_async_signal_handler_wrapper (void *token);
 extern void async_request_quit (void *arg);
 extern void stdin_event_handler (int error, void *client_data);
 extern void async_disable_stdin (void);
diff --git a/gdb/remote.c b/gdb/remote.c
index 1750bee07e..14c5dfd59e 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -4862,7 +4862,7 @@ static void
 handle_remote_sigint (int sig)
 {
   signal (sig, handle_remote_sigint_twice);
-  mark_async_signal_handler_wrapper (sigint_remote_token);
+  mark_async_signal_handler (sigint_remote_token);
 }
 
 /* Signal handler for SIGINT, installed after SIGINT has already been
@@ -4872,7 +4872,7 @@ static void
 handle_remote_sigint_twice (int sig)
 {
   signal (sig, handle_remote_sigint);
-  mark_async_signal_handler_wrapper (sigint_remote_twice_token);
+  mark_async_signal_handler (sigint_remote_twice_token);
 }
 
 /* Perform the real interruption of the target execution, in response
-- 
2.34.1