From c5ed1f9d8736a09c43277c99fc4a41e169e587bf Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Fri, 23 Apr 2021 16:41:22 +0200 Subject: [PATCH] BUG/MINOR: haproxy: fix compilation on macOS Fix the warning treated as error on the CI for the macOS compilation : "src/haproxy.c:2939:23: error: unused variable 'set' [-Werror,-Wunused-variable]" This does not need to be backported. --- src/haproxy.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/haproxy.c b/src/haproxy.c index b89c51779..e19b8148a 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -2936,10 +2936,11 @@ int main(int argc, char **argv) proc < MAX_PROCS && /* only the first 32/64 processes may be pinned */ ha_cpuset_count(&global.cpu_map.proc[proc])) { /* only do this if the process has a CPU map */ - struct hap_cpuset *set = &global.cpu_map.proc[proc]; #ifdef __FreeBSD__ + struct hap_cpuset *set = &global.cpu_map.proc[proc]; ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(set->cpuset), &set->cpuset); #elif defined(__linux__) || defined(__DragonFly__) + struct hap_cpuset *set = &global.cpu_map.proc[proc]; sched_setaffinity(0, sizeof(set->cpuset), &set->cpuset); #endif }