From: David CARLIER <devnexen@gmail.com>
Date: Fri, 31 Dec 2021 05:00:12 +0000 (+0000)
Subject: BUILD/MINOR: cpuset FreeBSD 14 build fix.
X-Git-Tag: v2.5.1~10
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=d03e32770d97af5114f9647d410ba89208aaf046;p=haproxy-2.5.git

BUILD/MINOR: cpuset FreeBSD 14 build fix.

The 14th release started to introduce api compatibility layer with Linux
for the cpuset part and doing so irrevocably change the CPU* macros as well.

(cherry picked from commit f64504716843f69a9b10582b2d9cce6a7919795a)
Signed-off-by: Willy Tarreau <w@1wt.eu>
---

diff --git a/include/haproxy/cpuset-t.h b/include/haproxy/cpuset-t.h
index 541fb75..00f7342 100644
--- a/include/haproxy/cpuset-t.h
+++ b/include/haproxy/cpuset-t.h
@@ -23,7 +23,12 @@
 #elif defined(__FreeBSD__) || defined(__NetBSD__)
 
 # define CPUSET_REPR cpuset_t
-# define CPUSET_USE_FREEBSD_CPUSET
+
+# if defined(__FreeBSD__) && __FreeBSD_version >= 1400046
+#  define CPUSET_USE_CPUSET
+# else
+#  define CPUSET_USE_FREEBSD_CPUSET
+# endif
 
 #elif defined(__APPLE__)