From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 25 Jan 2018 15:10:16 +0000 (+0100)
Subject: MINOR: threads: Use __decl_hathreads instead of #ifdef/#endif
X-Git-Tag: v1.9-dev1~494
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da18b9db7b26080b899985191c6344d79f5497b5;p=thirdparty%2Fhaproxy.git

MINOR: threads: Use __decl_hathreads instead of #ifdef/#endif

A #ifdef/#endif on USE_THREAD was added in the commit 0048dd04 ("MINOR: threads:
Fix build when we're not compiling with threads.") to conditionally define the
start_lock variable, because HA_SPINLOCK_T is only defined when HAProxy is
compiled with threads.

If fact, to do that, we should use the macro __decl_hathreads instead.

If commit 0048dd04 is backported in 1.8, this one can also be backported.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 8a4e8a5637..34e8f7549f 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2422,9 +2422,7 @@ static void *run_thread_poll_loop(void *data)
 {
 	struct per_thread_init_fct   *ptif;
 	struct per_thread_deinit_fct *ptdf;
-#ifdef USE_THREAD
-	static HA_SPINLOCK_T start_lock;
-#endif
+	__decl_hathreads(static HA_SPINLOCK_T start_lock);
 
 	tid     = *((unsigned int *)data);
 	tid_bit = (1UL << tid);