From: David CARLIER <devnexen@gmail.com>
Date: Sat, 8 Jan 2022 09:59:38 +0000 (+0000)
Subject: BUILD: cpuset: fix build issue on macos introduced by previous change
X-Git-Tag: v2.6-dev1~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb10dad5a8321ecc437ef637385ee3a0e7c09747;p=thirdparty%2Fhaproxy.git

BUILD: cpuset: fix build issue on macos introduced by previous change

The build on macos was broken by recent commit df91cbd58 ("MINOR: cpuset:
switch to sched_setaffinity for FreeBSD 14 and above."), let's move the
variable declaration inside the ifdef.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 17108b52f9..67ce74ea11 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3238,10 +3238,11 @@ int main(int argc, char **argv)
 #ifdef USE_CPU_AFFINITY
 		if (!in_parent && ha_cpuset_count(&cpu_map.proc)) {   /* only do this if the process has a CPU map */
 
-			struct hap_cpuset *set = &cpu_map.proc;
 #if defined(CPUSET_USE_CPUSET) || defined(__DragonFly__)
+			struct hap_cpuset *set = &cpu_map.proc;
 			sched_setaffinity(0, sizeof(set->cpuset), &set->cpuset);
 #elif defined(__FreeBSD__)
+			struct hap_cpuset *set = &cpu_map.proc;
 			ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(set->cpuset), &set->cpuset);
 #endif
 		}