diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-12-18 16:12:38 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-12-18 16:15:49 -0800 |
| commit | f05a93e8232e6f56458ac16d733b03e96a63e930 (patch) | |
| tree | b6b95198cf4b5e0b2969b7a427db1c5146a7d856 /lib/nproc.c | |
| parent | 35da3ed05212e0222841becf614c109011f9ad80 (diff) | |
| download | emacs-f05a93e8232e6f56458ac16d733b03e96a63e930.tar.gz | |
Update from gnulib
Make the following changes by hand, and run ‘admin/merge-gnulib’.
* configure.ac (AM_CONDITIONAL): Adjust to new Gnulib convention.
Diffstat (limited to 'lib/nproc.c')
| -rw-r--r-- | lib/nproc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/nproc.c b/lib/nproc.c index a9e369dd3f7..1af989d6dd0 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 |