From 48bd2f2b997b26ac187757a65936619969d15ddb Mon Sep 17 00:00:00 2001
From: Evan Martin <martine@danga.com>
Date: Sat, 28 Jul 2012 13:27:27 -0700
Subject: simplify load-average code

---
 src/util.cc | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/util.cc b/src/util.cc
index ca05292..2277a82 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -284,17 +284,14 @@ string StripAnsiEscapeCodes(const string& in) {
 }
 
 #ifdef _WIN32
-static double GetLoadAverage_win32()
-{
+double GetLoadAverage() {
   // TODO(nicolas.despres@gmail.com): Find a way to implement it on Windows.
   return -0.0f;
 }
 #else
-static double GetLoadAverage_unix()
-{
+double GetLoadAverage() {
   double loadavg[3] = { 0.0f, 0.0f, 0.0f };
-  if (getloadavg(loadavg, 3) < 0)
-  {
+  if (getloadavg(loadavg, 3) < 0) {
     // Maybe we should return an error here or the availability of
     // getloadavg(3) should be checked when ninja is configured.
     return -0.0f;
@@ -302,12 +299,3 @@ static double GetLoadAverage_unix()
   return loadavg[0];
 }
 #endif // _WIN32
-
-double GetLoadAverage()
-{
-#ifdef _WIN32
-  return GetLoadAverage_win32();
-#else
-  return GetLoadAverage_unix();
-#endif // _WIN32
-}
-- 
cgit v0.12