summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-07-18 13:05:44 +0000
committerGerd Moellmann <gerd@gnu.org>2000-07-18 13:05:44 +0000
commit088831a6ffd0595c2ab5ed46169b2934171b8042 (patch)
tree9af31f5cc56e5e1b15566823e5746c9f4a1514e5 /src
parent99d5dc1271e4e1e5db659f19d4e075c0245843eb (diff)
downloademacs-088831a6ffd0595c2ab5ed46169b2934171b8042.tar.gz
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4c887b9624a..66162f133ec 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-18 Gerd Moellmann <gerd@gnu.org>
+
+ * alloca.c (free) [emacs && EMACS_FREE]: Define as EMACS_FREE.
+
+ * Makefile.in: Add dependencies on dispextern.h.
+ (alloca.o): Don't define malloc and define EMACS_FREE instead of
+ `free'; both can conflict with system header files.
+
2000-07-18 Kenichi Handa <handa@etl.go.jp>
* charset.h (MAKE_CHAR): Return reasonable code even if CHARSET is