summaryrefslogtreecommitdiff
path: root/signal.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-12-12 16:06:19 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-12-12 17:02:42 +0900
commit0df67a469561fab80b78478b99703ed893c4db07 (patch)
tree8cc322d18f27911bc5c6f42e8d924ada80ed5c4d /signal.c
parent21c5726418136d6efa98cbf205860a8bee328907 (diff)
Signal handler type should be void
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3889
Diffstat (limited to 'signal.c')
-rw-r--r--signal.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/signal.c b/signal.c
index 91521fe807..6eea6aabe2 100644
--- a/signal.c
+++ b/signal.c
@@ -415,7 +415,7 @@ ruby_default_signal(int sig)
raise(sig);
}
-static RETSIGTYPE sighandler(int sig);
+static void sighandler(int sig);
static int signal_ignored(int sig);
static void signal_enque(int sig);
@@ -519,7 +519,7 @@ typedef void ruby_sigaction_t(int, siginfo_t*, void*);
#define SIGINFO_ARG , siginfo_t *info, void *ctx
#define SIGINFO_CTX ctx
#else
-typedef RETSIGTYPE ruby_sigaction_t(int);
+typedef void ruby_sigaction_t(int);
#define SIGINFO_ARG
#define SIGINFO_CTX 0
#endif
@@ -712,7 +712,7 @@ static rb_atomic_t sigchld_hit;
# define GET_SIGCHLD_HIT() 0
#endif
-static RETSIGTYPE
+static void
sighandler(int sig)
{
int old_errnum = errno;
@@ -930,7 +930,7 @@ NOINLINE(static void check_reserved_signal_(const char *name, size_t name_len));
static sighandler_t default_sigbus_handler;
NORETURN(static ruby_sigaction_t sigbus);
-static RETSIGTYPE
+static void
sigbus(int sig SIGINFO_ARG)
{
check_reserved_signal("BUS");
@@ -952,7 +952,7 @@ sigbus(int sig SIGINFO_ARG)
static sighandler_t default_sigsegv_handler;
NORETURN(static ruby_sigaction_t sigsegv);
-static RETSIGTYPE
+static void
sigsegv(int sig SIGINFO_ARG)
{
check_reserved_signal("SEGV");
@@ -966,7 +966,7 @@ sigsegv(int sig SIGINFO_ARG)
static sighandler_t default_sigill_handler;
NORETURN(static ruby_sigaction_t sigill);
-static RETSIGTYPE
+static void
sigill(int sig SIGINFO_ARG)
{
check_reserved_signal("ILL");
@@ -1031,7 +1031,7 @@ check_reserved_signal_(const char *name, size_t name_len)
#endif
#if defined SIGPIPE || defined SIGSYS
-static RETSIGTYPE
+static void
sig_do_nothing(int sig)
{
}