aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Innes2000-07-04 13:06:30 +0000
committerAndrew Innes2000-07-04 13:06:30 +0000
commit4954f4b07534cc59b68acc2ef4ace46e9f85934a (patch)
treeb7745601c9618de99fa1deccc85abee07228a0c3 /src
parent5365473301185cda5276645287697da3f807d705 (diff)
downloademacs-4954f4b07534cc59b68acc2ef4ace46e9f85934a.tar.gz
emacs-4954f4b07534cc59b68acc2ef4ace46e9f85934a.zip
[emacs]: Include lisp.h (needed by atimer.h included
here via blockinput.h).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/alloca.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f3f521aa47c..8e8823cd04b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12000-07-04 Andrew Innes <andrewi@gnu.org>
2
3 * alloca.c [emacs]: Include lisp.h (needed by atimer.h included
4 here via blockinput.h).
5
12000-07-04 Gerd Moellmann <gerd@gnu.org> 62000-07-04 Gerd Moellmann <gerd@gnu.org>
2 7
3 * keymap.c (get_keyelt): Temporarily inhibit GC while evaluating 8 * keymap.c (get_keyelt): Temporarily inhibit GC while evaluating
diff --git a/src/alloca.c b/src/alloca.c
index 8f98b73dbb9..1f760fe6173 100644
--- a/src/alloca.c
+++ b/src/alloca.c
@@ -33,6 +33,7 @@
33#endif 33#endif
34 34
35#ifdef emacs 35#ifdef emacs
36#include "lisp.h"
36#include "blockinput.h" 37#include "blockinput.h"
37#endif 38#endif
38 39