commit ce8a1a303e45e425a5c6b5edd78a900d3e546a2c
author David CARLIER <devnexen@gmail.com> Fri Dec 31 05:00:12 2021 +0000
committer Willy Tarreau <w@1wt.eu> Fri Jan 07 15:59:31 2022 +0100
tree f6a4e4771f520119e912897b6fc5b085dfe32fca
parent ec3d2d6515be4095e3acb38a870dfd245abccfff

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>
(cherry picked from commit d03e32770d97af5114f9647d410ba89208aaf046)
Signed-off-by: Willy Tarreau <w@1wt.eu>

include/haproxy/cpuset-t.h

diff --git a/include/haproxy/cpuset-t.h b/include/haproxy/cpuset-t.h
index 195b46a..7731464 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__)