diff --git a/memcached.c b/memcached.c index d796abb4b..dc67267c4 100644 --- a/memcached.c +++ b/memcached.c @@ -8400,18 +8400,6 @@ static void sig_usrhandler(const int sig) { stop_main_loop = GRACE_STOP; } -#ifndef HAVE_SIGIGNORE -static int sigignore(int sig) { - struct sigaction sa = { .sa_handler = SIG_IGN, .sa_flags = 0 }; - - if (sigemptyset(&sa.sa_mask) == -1 || sigaction(sig, &sa, 0) == -1) { - return -1; - } - return 0; -} -#endif - - /* * On systems that supports multiple page sizes we may reduce the * number of TLB-misses by using the biggest available page size @@ -10097,7 +10085,7 @@ int main (int argc, char **argv) { /* daemonize if requested */ /* if we want to ensure our ability to dump core, don't chdir to / */ if (do_daemonize) { - if (sigignore(SIGHUP) == -1) { + if (signal(SIGHUP, SIG_IGN) == SIG_ERR) { perror("Failed to ignore SIGHUP"); } if (daemonize(maxcore, settings.verbose) == -1) { @@ -10247,7 +10235,7 @@ int main (int argc, char **argv) { * ignore SIGPIPE signals; we can use errno == EPIPE if we * need that information */ - if (sigignore(SIGPIPE) == -1) { + if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) { perror("failed to ignore SIGPIPE; sigaction"); exit(EX_OSERR); }