diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32.c | 11 | ||||
| -rw-r--r-- | src/w32proc.c | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/w32.c b/src/w32.c index 0eb69d4b1d1..9fe698d28d7 100644 --- a/src/w32.c +++ b/src/w32.c @@ -39,6 +39,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ #include <sys/time.h> #include <sys/utime.h> #include <math.h> +#include <nproc.h> /* Include (most) CRT headers *before* ms-w32.h. */ #include <ms-w32.h> @@ -1962,6 +1963,16 @@ w32_get_nproc (void) return num_of_processors; } +/* Emulate Gnulib's 'num_processors'. We cannot use the Gnulib + version because it unconditionally calls APIs that aren't available + on old MS-Windows versions. */ +unsigned long +num_processors (enum nproc_query query) +{ + /* We ignore QUERY. */ + return w32_get_nproc (); +} + static void sample_system_load (ULONGLONG *idle, ULONGLONG *kernel, ULONGLONG *user) { diff --git a/src/w32proc.c b/src/w32proc.c index 3b7d92a2aa8..360f45e9e11 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -3878,15 +3878,6 @@ w32_compare_strings (const char *s1, const char *s2, char *locname, return val - 2; } -/* FIXME: Remove, merging any of its special features into num-processors. */ -DEFUN ("w32-get-nproc", Fw32_get_nproc, - Sw32_get_nproc, 0, 0, 0, - doc: /* Return the number of system's processor execution units. */) - (void) -{ - return make_fixnum (w32_get_nproc ()); -} - void syms_of_ntproc (void) @@ -3921,8 +3912,6 @@ syms_of_ntproc (void) defsubr (&Sw32_get_keyboard_layout); defsubr (&Sw32_set_keyboard_layout); - defsubr (&Sw32_get_nproc); - DEFVAR_LISP ("w32-quote-process-args", Vw32_quote_process_args, doc: /* Non-nil enables quoting of process arguments to ensure correct parsing. Because Windows does not directly pass argv arrays to child processes, |