summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Niklas Hasse <jhasse@bixense.com>2019-08-08 09:52:19 (GMT)
committerGitHub <noreply@github.com>2019-08-08 09:52:19 (GMT)
commit6d8c19a13f40c05696d6dea3e28f6b99d55f6eaf (patch)
treecb1400948b262174d8a7acff3a7225c301ea1b71 /src
parent0ea27d728d34e3e2a1eae6f54dbe6ca0822a0b4a (diff)
parent007e029ea35e29466bd40cc38de42d3c8eab70d3 (diff)
downloadNinja-6d8c19a13f40c05696d6dea3e28f6b99d55f6eaf.zip
Ninja-6d8c19a13f40c05696d6dea3e28f6b99d55f6eaf.tar.gz
Ninja-6d8c19a13f40c05696d6dea3e28f6b99d55f6eaf.tar.bz2
Merge pull request #1604 from jessemckenna/correct-cpu-count-over-64
Enable ninja to use > 64 CPUs on Windows
Diffstat (limited to 'src')
-rw-r--r--src/util.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/util.cc b/src/util.cc
index ee810d6..f80616b 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -481,9 +481,7 @@ string StripAnsiEscapeCodes(const string& in) {
int GetProcessorCount() {
#ifdef _WIN32
- SYSTEM_INFO info;
- GetNativeSystemInfo(&info);
- return info.dwNumberOfProcessors;
+ return GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
#else
#ifdef CPU_COUNT
// The number of exposed processors might not represent the actual number of