PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio
Commits: b8c656b6 by Laurent Bigonville at 2020-11-25T14:54:49+00:00 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> - - - - - 2 changed files: - src/tests/once-test.c - src/tests/rtstutter.c Changes: ===================================== 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; ===================================== 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; View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/b8c656b6645a1ec7d8bef0f1cef557eaba4eaea8 -- View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/b8c656b6645a1ec7d8bef0f1cef557eaba4eaea8 You're receiving this email because of your account on gitlab.freedesktop.org.
_______________________________________________ pulseaudio-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
