summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2013-02-09 18:34:07 (GMT)
committerEvan Martin <martine@danga.com>2013-02-09 18:34:07 (GMT)
commit27f7528ebdae1586501fb083f8d5d3be711bb367 (patch)
treebc0da46cd08671355aaca0c927a3ce88d6ba665c
parent05736568b9a26599865dd7452e62f70ecdbc9e41 (diff)
parentbed9541e7f5123612dbcb1840ee096a92c2e18dc (diff)
downloadNinja-27f7528ebdae1586501fb083f8d5d3be711bb367.zip
Ninja-27f7528ebdae1586501fb083f8d5d3be711bb367.tar.gz
Ninja-27f7528ebdae1586501fb083f8d5d3be711bb367.tar.bz2
Merge pull request #498 from pck/cygwin
util.cc: Reusing windows workaround for cygwin.
-rw-r--r--src/util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.cc b/src/util.cc
index 50e3842..91e8fad 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -325,7 +325,7 @@ int GetProcessorCount() {
}
#endif
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__CYGWIN__)
double GetLoadAverage() {
// TODO(nicolas.despres@gmail.com): Find a way to implement it on Windows.
// Remember to also update Usage() when this is fixed.