From b9cf58d2b2deca7d5b204080c2fe04d68cc50ab1 Mon Sep 17 00:00:00 2001 From: Yusuke Endoh Date: Wed, 9 Oct 2019 22:57:19 +0900 Subject: signal.c (ruby_abort): move the definition for refactoring The three functions for fatal signals, sigbus, sigsegv, and sigill, are a family. The definition of ruby_abort had interrupted them for no reason. This change just moves the definition after the family. --- signal.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'signal.c') diff --git a/signal.c b/signal.c index 25f954033e..7fc93bb0b9 100644 --- a/signal.c +++ b/signal.c @@ -937,24 +937,6 @@ sigbus(int sig SIGINFO_ARG) } #endif -#ifndef __sun -NORETURN(static void ruby_abort(void)); -#endif - -static void -ruby_abort(void) -{ -#ifdef __sun - /* Solaris's abort() is async signal unsafe. Of course, it is not - * POSIX compliant. - */ - raise(SIGABRT); -#else - abort(); -#endif - -} - #ifdef SIGSEGV NORETURN(static ruby_sigaction_t sigsegv); @@ -983,6 +965,23 @@ sigill(int sig SIGINFO_ARG) } #endif +#ifndef __sun +NORETURN(static void ruby_abort(void)); +#endif + +static void +ruby_abort(void) +{ +#ifdef __sun + /* Solaris's abort() is async signal unsafe. Of course, it is not + * POSIX compliant. + */ + raise(SIGABRT); +#else + abort(); +#endif +} + static void check_reserved_signal_(const char *name, size_t name_len) { -- cgit v1.2.1