From 7208aa15cbd9ea13bb19befd8f4cedc636120503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
Date: Wed, 6 Dec 2023 20:20:02 +0100
Subject: [PATCH] build: Remove check for sigaction
The build actually failed in the !HAVE_SIGACTION case, so it seems safe
not to check for the presence of this function.
---
configure.ac | 2 +-
src/subprocs.c | 12 ------------
src/subprocs.h | 4 ----
3 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3f987daf..e595242d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ LIBWNCK_REQUIRED=3.20
AC_CHECK_HEADERS(unistd.h)
AC_CHECK_HEADERS(crypt.h sys/select.h)
AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk)
-AC_CHECK_FUNCS(sigaction syslog realpath setrlimit)
+AC_CHECK_FUNCS(syslog realpath setrlimit)
AC_CHECK_FUNCS(getresuid)
AC_TYPE_UID_T
diff --git a/src/subprocs.c b/src/subprocs.c
index 82928758..468f95bc 100644
--- a/src/subprocs.c
+++ b/src/subprocs.c
@@ -50,38 +50,26 @@
static int block_sigchld_handler = 0;
-#ifdef HAVE_SIGACTION
sigset_t
-#else /* !HAVE_SIGACTION */
-int
-#endif /* !HAVE_SIGACTION */
block_sigchld (void) {
-#ifdef HAVE_SIGACTION
sigset_t child_set;
sigemptyset (&child_set);
sigaddset (&child_set, SIGCHLD);
sigaddset (&child_set, SIGPIPE);
sigprocmask (SIG_BLOCK, &child_set, 0);
-#endif /* HAVE_SIGACTION */
block_sigchld_handler++;
-#ifdef HAVE_SIGACTION
return child_set;
-#else /* !HAVE_SIGACTION */
- return 0;
-#endif /* !HAVE_SIGACTION */
}
void
unblock_sigchld (void) {
-#ifdef HAVE_SIGACTION
sigset_t child_set;
sigemptyset (&child_set);
sigaddset (&child_set, SIGCHLD);
sigaddset (&child_set, SIGPIPE);
sigprocmask (SIG_UNBLOCK, &child_set, 0);
-#endif /* HAVE_SIGACTION */
block_sigchld_handler--;
}
diff --git a/src/subprocs.h b/src/subprocs.h
index b07536c2..a24fb566 100644
--- a/src/subprocs.h
+++ b/src/subprocs.h
@@ -23,11 +23,7 @@ G_BEGIN_DECLS
void unblock_sigchld (void);
-#ifdef HAVE_SIGACTION
sigset_t
-#else /* !HAVE_SIGACTION */
-int
-#endif /* !HAVE_SIGACTION */
block_sigchld (void);
int signal_pid (int pid,
--
GitLab