From: Eric Covener <covener@apache.org>
Date: Thu, 5 May 2022 02:03:27 +0000 (+0000)
Subject: r1900362 followup: clang -Wexpansion-to-defined
X-Git-Tag: 2.5.0-alpha2-ci-test-only~351
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7dfa99412c862d89a9f8f0146653387f12ff74c;p=thirdparty%2Fapache%2Fhttpd.git

r1900362 followup: clang -Wexpansion-to-defined

ab.c:2056:5: error: macro expansion producing 'defined' has undefined behavior [-Werror,-Wexpansion-to-defined]
#if USE_SIGMASK



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900571 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/ab.c b/support/ab.c
index 7906b84c934..020faa7b8d4 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -2028,9 +2028,12 @@ static void join_worker(struct worker *worker);
 static void workers_may_exit(int sig);
 #endif /* SIGINT */
 
-#define USE_SIGMASK (APR_HAS_THREADS \
-                     && (APR_HAVE_PTHREAD_H \
-                         || defined(SIGPROCMASK_SETS_THREAD_MASK)))
+#if (APR_HAS_THREADS \
+     && (APR_HAVE_PTHREAD_H || defined(SIGPROCMASK_SETS_THREAD_MASK)))
+#define USE_SIGMASK 1
+#else
+#define USE_SIGMASK 0
+#endif
 
 static void init_signals(void)
 {