From 7acb179df8d9dc4d280a510ca76fb8344f4d225f Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 21 Jun 2022 14:03:25 -0700 Subject: QThread:idealThreadCount: fix build with FreeBSD 13.1 They added the CPU_COUNT_S macro. Change-Id: I6d3880c7d99d4fc494c8fffd16fabe9f8226ecda Reviewed-by: Volker Hilsheimer (cherry picked from commit 45de3fedbac73bc8ff501117d64f19092e1b18b4) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/thread/qthread_unix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 12c057110d..d7e5135199 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -413,7 +413,7 @@ int QThread::idealThreadCount() noexcept cores = (int)psd.psd_proc_cnt; } #elif (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) || defined(Q_OS_FREEBSD) -# ifdef Q_OS_FREEBSD +# if defined(Q_OS_FREEBSD) && !defined(CPU_COUNT_S) # define CPU_COUNT_S(setsize, cpusetp) ((int)BIT_COUNT(setsize, cpusetp)) // match the Linux API for simplicity using cpu_set_t = cpuset_t; -- cgit v1.2.3