From b8c656b6645a1ec7d8bef0f1cef557eaba4eaea8 Mon Sep 17 00:00:00 2001
From: Laurent Bigonville <bigon@bigon.be>
Date: Thu, 27 Aug 2020 15:58:55 +0200
Subject: [PATCH] tests: Fix incompatible pointer type on Debian kfreebsd

Debian kfreebsd uses the GNU libc that uses cpu_set_t instead of cpuset_t

Also do not include unnecessary headers on this platform

Fixes: #851
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/356>
---
 src/tests/once-test.c | 4 +---
 src/tests/rtstutter.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/tests/once-test.c b/src/tests/once-test.c
index cb5618707..c4d4b4be6 100644
--- a/src/tests/once-test.c
+++ b/src/tests/once-test.c
@@ -22,10 +22,8 @@
 #ifdef HAVE_PTHREAD
 #include <pthread.h>
 #ifdef HAVE_PTHREAD_SETAFFINITY_NP
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #ifdef __FreeBSD__
 #include <pthread_np.h>
-#endif
 #include <sys/param.h>
 #include <sys/cpuset.h>
 #endif
@@ -63,7 +61,7 @@ static void thread_func(void *data) {
 
 #ifdef HAVE_PTHREAD_SETAFFINITY_NP
     static pa_atomic_t i_cpu = PA_ATOMIC_INIT(0);
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#ifdef __FreeBSD__
     cpuset_t mask;
 #else
     cpu_set_t mask;
diff --git a/src/tests/rtstutter.c b/src/tests/rtstutter.c
index 56b5146ca..9d74855a3 100644
--- a/src/tests/rtstutter.c
+++ b/src/tests/rtstutter.c
@@ -29,10 +29,8 @@
 #ifdef HAVE_PTHREAD
 #include <pthread.h>
 #ifdef HAVE_PTHREAD_SETAFFINITY_NP
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #ifdef __FreeBSD__
 #include <pthread_np.h>
-#endif
 #include <sys/param.h>
 #include <sys/cpuset.h>
 #endif
@@ -61,7 +59,7 @@ static void work(void *p) {
 
 #ifdef HAVE_PTHREAD_SETAFFINITY_NP
 {
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#ifdef __FreeBSD__
     cpuset_t mask;
 #else
     cpu_set_t mask;