diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-21 14:03:25 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-22 08:55:20 +0000 |
| commit | 7acb179df8d9dc4d280a510ca76fb8344f4d225f (patch) | |
| tree | 28615d923ab5e3aeaf354a2140466bb6bb552076 | |
| parent | ff8e23973dbd4b4a821f7d63f0aafbe9350e6b0b (diff) | |
QThread:idealThreadCount: fix build with FreeBSD 13.1
They added the CPU_COUNT_S macro.
Change-Id: I6d3880c7d99d4fc494c8fffd16fabe9f8226ecda
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 45de3fedbac73bc8ff501117d64f19092e1b18b4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |