From: Paul Eggert Date: Sat, 16 Oct 2021 02:33:46 +0000 (-0700) Subject: nproc: port better to macOS 10.14 X-Git-Tag: v1.0~2572 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=720d73c395bb2fcbae3566339a4102b485aa491d;p=gnulib.git nproc: port better to macOS 10.14 * lib/nproc.c (num_processors_ignoring_omp) [HAVE_SYSCTL && !defined __GLIBC__ && defined HW_NCPU]: Do not use a const mib, as macOS 10.14 rejects this. --- diff --git a/ChangeLog b/ChangeLog index ea71de0b20..87fd99f6a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-10-15 Paul Eggert + + nproc: port better to macOS 10.14 + * lib/nproc.c (num_processors_ignoring_omp) + [HAVE_SYSCTL && !defined __GLIBC__ && defined HW_NCPU]: + Do not use a const mib, as macOS 10.14 rejects this. + 2021-10-13 Paul Eggert sigsegv: fix quoting problem diff --git a/lib/nproc.c b/lib/nproc.c index a9e369dd3f..1af989d6dd 100644 --- a/lib/nproc.c +++ b/lib/nproc.c @@ -307,10 +307,11 @@ num_processors_ignoring_omp (enum nproc_query query) NPROC_CURRENT and NPROC_ALL. */ #if HAVE_SYSCTL && ! defined __GLIBC__ && defined HW_NCPU - { /* This works on Mac OS X, FreeBSD, NetBSD, OpenBSD. */ + { /* This works on macOS, FreeBSD, NetBSD, OpenBSD. + macOS 10.14 does not allow mib to be const. */ int nprocs; size_t len = sizeof (nprocs); - static int const mib[][2] = { + static int mib[][2] = { # ifdef HW_NCPUONLINE { CTL_HW, HW_NCPUONLINE }, # endif