aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-02-16 20:47:21 +0200
committerEli Zaretskii2011-02-16 20:47:21 +0200
commiteef5ce6ecc1207beb0fcd6c87647249e354831c4 (patch)
tree939b9f19b0f19fbff0cd2a53763871101b1f0cda /src
parent05c652517317d10690aaf0a6aa0bc876382b9d82 (diff)
downloademacs-eef5ce6ecc1207beb0fcd6c87647249e354831c4.tar.gz
emacs-eef5ce6ecc1207beb0fcd6c87647249e354831c4.zip
src/s/ms-w32.h (getloadavg): Declare prototype which was removed from lisp.h.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/s/ms-w32.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 20a85d87113..35d154a3807 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,7 @@
5 * w32term.c (w32_create_terminal): Use KVAR. 5 * w32term.c (w32_create_terminal): Use KVAR.
6 6
7 * s/ms-w32.h (MODE_LINE_BINARY_TEXT): Remove. 7 * s/ms-w32.h (MODE_LINE_BINARY_TEXT): Remove.
8 (getloadavg): Declare prototype which was removed from lisp.h.
8 9
9 * xdisp.c (decode_mode_spec): Don't use MODE_LINE_BINARY_TEXT. 10 * xdisp.c (decode_mode_spec): Don't use MODE_LINE_BINARY_TEXT.
10 11
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index be16866eaf5..8b189baea46 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -346,6 +346,8 @@ extern char *get_emacs_configuration_options (void);
346#endif 346#endif
347#include <string.h> 347#include <string.h>
348 348
349extern int getloadavg (double *, int);
350
349/* We need a little extra space, see ../../lisp/loadup.el. */ 351/* We need a little extra space, see ../../lisp/loadup.el. */
350#define SYSTEM_PURESIZE_EXTRA 50000 352#define SYSTEM_PURESIZE_EXTRA 50000
351 353