From 44e604f41621cf3e31dc5840686c99e0986b9a53 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 3 Feb 2006 18:46:38 +0000
Subject: [PATCH] Simplified the conditional prior to the SIGACTION code.

---
 cleanup.c | 2 +-
 socket.c  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cleanup.c b/cleanup.c
index 08609e16..b952cff0 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -26,7 +26,7 @@ extern int keep_partial;
 extern int log_got_error;
 extern char *partial_dir;
 
-#if defined HAVE_SIGACTION && defined HAVE_SIGPROCMASK
+#ifdef HAVE_SIGACTION
 static struct sigaction sigact;
 #endif
 
diff --git a/socket.c b/socket.c
index 7e779695..47f7ce16 100644
--- a/socket.c
+++ b/socket.c
@@ -36,7 +36,7 @@
 extern char *bind_address;
 extern int default_af_hint;
 
-#if defined HAVE_SIGACTION && defined HAVE_SIGPROCMASK
+#ifdef HAVE_SIGACTION
 static struct sigaction sigact;
 #endif
 
@@ -437,7 +437,7 @@ static RETSIGTYPE sigchld_handler(UNUSED(int val))
 #ifdef WNOHANG
 	while (waitpid(-1, NULL, WNOHANG) > 0) {}
 #endif
-#if !defined HAVE_SIGACTION && !defined HAVE_SIGPROCMASK
+#ifndef HAVE_SIGACTION
 	signal(SIGCHLD, sigchld_handler);
 #endif
 }
@@ -448,7 +448,7 @@ void start_accept_loop(int port, int (*fn)(int, int))
 	fd_set deffds;
 	int *sp, maxfd, i;
 
-#if defined HAVE_SIGACTION && defined HAVE_SIGPROCMASK
+#ifdef HAVE_SIGACTION
 	sigact.sa_flags = SA_NOCLDSTOP;
 #endif
 
-- 
2.34.1