From: Olivier Houchard Date: Wed, 24 Jan 2018 14:41:04 +0000 (+0100) Subject: MINOR: threads: Fix build when we're not compiling with threads. X-Git-Tag: v1.9-dev1~499 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0048dd04;p=thirdparty%2Fhaproxy.git MINOR: threads: Fix build when we're not compiling with threads. Only declare the start_lock if threads are compiled in, otherwise HA_SPINLOCK_T won't be defined. This should be backported to 1.8 when/if 1605c7ae6154d8c2cfcf3b325872b1a7266c5bc2 is backported. --- diff --git a/src/haproxy.c b/src/haproxy.c index 8e0e30d8a4..8a4e8a5637 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -2422,7 +2422,9 @@ static void *run_thread_poll_loop(void *data) { struct per_thread_init_fct *ptif; struct per_thread_deinit_fct *ptdf; - static __maybe_unused HA_SPINLOCK_T start_lock; +#ifdef USE_THREAD + static HA_SPINLOCK_T start_lock; +#endif tid = *((unsigned int *)data); tid_bit = (1UL << tid);