From: David Carlier <devnexen@gmail.com>
Date: Tue, 8 Mar 2022 14:49:29 +0000 (+0000)
Subject: BUILD: fix recent build breakage of freebsd caused by kFreeBSD build fix
X-Git-Tag: v2.6-dev3~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6709538068752ead403648ac5836f610d2da79e8;p=thirdparty%2Fhaproxy.git

BUILD: fix recent build breakage of freebsd caused by kFreeBSD build fix

Supporting kFreebsd previously led to FreeBSD (< 14) build breakage:

 In file included from src/cpuset.c:5:
 In file included from include/haproxy/cpuset.h:4:
 include/haproxy/cpuset-t.h:46:2: error: unknown type name 'cpu_set_t'; did you mean 'cpuset_t'?
         CPUSET_REPR cpuset;
         ^~~~~~~~~~~
         cpuset_t
 include/haproxy/cpuset-t.h:21:22: note: expanded from macro 'CPUSET_REPR'
 # define CPUSET_REPR cpu_set_t
                      ^
---

diff --git a/include/haproxy/cpuset-t.h b/include/haproxy/cpuset-t.h
index 984df8d839..b770b17912 100644
--- a/include/haproxy/cpuset-t.h
+++ b/include/haproxy/cpuset-t.h
@@ -16,7 +16,8 @@
 
 #include <haproxy/api-t.h>
 
-#if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+#if defined(__linux__) || defined(__DragonFly__) || \
+  (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
 
 # define CPUSET_REPR cpu_set_t
 # define CPUSET_USE_CPUSET