From 0f0b8dcdc328692f3b92cf2034b8866f0c01fa33 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 23 Feb 2006 18:37:42 +0000 Subject: [PATCH] * event-top.c (async_do_nothing, async_disconnect) (async_stop_sig, async_float_handler): Remove duplicated prototypes. (handle_sighup): Guard prototype with SIGHUP. (async_do_nothing): Guard function and prototype with SIGQUIT || SIGHUP. (async_disconnect): Guard prototype with SIGHUP. (async_stop_sig): Guard prototype with STOP_SIGNAL. --- gdb/ChangeLog | 11 +++++++++++ gdb/event-top.c | 17 ++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9ab237cd5d3..2080adb64dc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2006-02-23 Daniel Jacobowitz + + * event-top.c (async_do_nothing, async_disconnect) + (async_stop_sig, async_float_handler): Remove duplicated + prototypes. + (handle_sighup): Guard prototype with SIGHUP. + (async_do_nothing): Guard function and prototype with + SIGQUIT || SIGHUP. + (async_disconnect): Guard prototype with SIGHUP. + (async_stop_sig): Guard prototype with STOP_SIGNAL. + 2006-02-23 Daniel Jacobowitz * maint.c (maintenance_dump_me): Remove unnecessary prototype. diff --git a/gdb/event-top.c b/gdb/event-top.c index 6bbb1efcb0e..635ce0fdc5d 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -49,16 +49,14 @@ static void command_line_handler_continuation (struct continuation_arg *arg); static void change_line_handler (void); static void change_annotation_level (void); static void command_handler (char *command); -static void async_do_nothing (gdb_client_data arg); -static void async_disconnect (gdb_client_data arg); -static void async_stop_sig (gdb_client_data arg); -static void async_float_handler (gdb_client_data arg); /* Signal handlers. */ #ifdef SIGQUIT static void handle_sigquit (int sig); #endif +#ifdef SIGHUP static void handle_sighup (int sig); +#endif static void handle_sigfpe (int sig); #if defined(SIGWINCH) && defined(SIGWINCH_HANDLER) static void handle_sigwinch (int sig); @@ -66,10 +64,16 @@ static void handle_sigwinch (int sig); /* Functions to be invoked by the event loop in response to signals. */ +#if defined (SIGQUIT) || defined (SIGHUP) static void async_do_nothing (gdb_client_data); +#endif +#ifdef SIGHUP static void async_disconnect (gdb_client_data); +#endif static void async_float_handler (gdb_client_data); +#ifdef STOP_SIGNAL static void async_stop_sig (gdb_client_data); +#endif /* Readline offers an alternate interface, via callback functions. These are all included in the file callback.c in the @@ -993,12 +997,15 @@ handle_sigquit (int sig) } #endif -/* Called by the event loop in response to a SIGQUIT. */ +#if defined (SIGQUIT) || defined (SIGHUP) +/* Called by the event loop in response to a SIGQUIT or an + ignored SIGHUP. */ static void async_do_nothing (gdb_client_data arg) { /* Empty function body. */ } +#endif #ifdef SIGHUP /* Tell the event loop what to do if SIGHUP is received. -- 2.30.2