From 396571ed89ec4260ba3fd1b7ce2b38b07bd90ab7 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Tue, 28 Feb 2006 22:49:15 +0100 Subject: [PATCH] Merged with v3.8 --- build/sherlock.cfg | 6 +++--- lib/sighandler.c | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build/sherlock.cfg b/build/sherlock.cfg index b5b5683a..bb92a153 100644 --- a/build/sherlock.cfg +++ b/build/sherlock.cfg @@ -1,11 +1,11 @@ # Configuration variables of Sherlock and their default values -# (c) 2005 Martin Mares +# (c) 2005--2006 Martin Mares # Version of the whole package -Set("SHERLOCK_VERSION" => "3.8"); +Set("SHERLOCK_VERSION" => "3.9"); # Installation directory for `make install' -Set("INSTALL_DIR" => "~/run-3.8"); +Set("INSTALL_DIR" => "~/run-3.9"); # Compile everything with debug information and ASSERT's UnSet("CONFIG_DEBUG"); diff --git a/lib/sighandler.c b/lib/sighandler.c index 9a768514..ca826908 100644 --- a/lib/sighandler.c +++ b/lib/sighandler.c @@ -26,21 +26,17 @@ signal_handler_internal(int sig) void handle_signal(int signum, struct sigaction *oldact) { -#if 0 struct sigaction act; bzero(&act, sizeof(act)); act.sa_handler = signal_handler_internal; act.sa_flags = SA_NOMASK; if (sigaction(signum, &act, oldact) < 0) die("sigaction: %m"); -#endif } void unhandle_signal(int signum, struct sigaction *oldact) { -#if 0 if (sigaction(signum, oldact, NULL) < 0) die("sigaction: %m"); -#endif } -- 2.39.5