summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2019-05-07 17:48:32 +0300
committerEli Zaretskii <eliz@gnu.org>2019-05-07 17:48:32 +0300
commite10d08df7edbb2e9e90169d19c3361099802fad6 (patch)
treee85ea377d974ff84f3bf9c4e696ae29573aa06d5 /src
parent921d279e15256a07168033b0c50f1fc82e22ef7f (diff)
downloademacs-e10d08df7edbb2e9e90169d19c3361099802fad6.tar.gz
Fix 'load-average' on MS-Windows
* src/w32.c (getloadavg): Always return at least one element of the array.
Diffstat (limited to 'src')
-rw-r--r--src/w32.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/w32.c b/src/w32.c
index 677c37fcb5d..833ff4c7e4a 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -2003,6 +2003,13 @@ getloadavg (double loadavg[], int nelem)
loadavg[elem] = avg;
}
+ /* Always return at least one element, otherwise load-average
+ returns nil, and Lisp programs might decide we cannot measure
+ system load. For example, jit-lock-stealth-load's defcustom
+ might decide that feature is "unsupported". */
+ if (elem == 0)
+ loadavg[elem++] = 0.09; /* < display-time-load-average-threshold */
+
return elem;
}