Merge branch 'master' into dev

This commit is contained in:
daan 2020-06-17 19:28:15 -07:00
commit 4ecce78d66

View File

@ -1042,7 +1042,7 @@ static size_t mi_os_numa_nodex() {
static size_t mi_os_numa_node_countx(void) { static size_t mi_os_numa_node_countx(void) {
ULONG numa_max = 0; ULONG numa_max = 0;
GetNumaHighestNodeNumber(&numa_max); GetNumaHighestNodeNumber(&numa_max);
return (numa_max + 1); return ((size_t)numa_max + 1);
} }
#elif defined(__linux__) #elif defined(__linux__)
#include <sys/syscall.h> // getcpu #include <sys/syscall.h> // getcpu