2 files changed, 22 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6eb18889c3a..6933cd190e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2000-06-20  Dave Love  <fx@gnu.org>
+
+        * keyboard.h (poll_for_input_1): Declare.
+
+        * getloadavg.c: Don't define NLIST_STRUCT (handled by configure).
+
+        * alloc.c (xmalloc, xrealloc, xfree): Define using POINTER_TYPE.
+
+        * doprnt.c: Don't declare xmalloc, xrealloc.
+
+        * lisp.h (x_set_tool_bar_lines, free_frame_xic, compose_text)
+        (getenv, ctime, getwd): Removed.
+        (xmalloc, xrealloc, xfree): Declare using POINTER_TYPE.
+
+        * xterm.h: Remove duplicate prototypes.  Declare free_frame_xic,
+        x_set_tool_bar_lines.
+
+        * config.in: Add HAVE_GETWD.  Move some definitions above
+        machine/system includes.
+
 2000-06-20  Kenichi Handa  <handa@etl.go.jp>
 
         * s/bsd386.h (HAVE_GETLOADAVG): Define it as 1.
diff --git a/src/lisp.h b/src/lisp.h
index cdaad4f1cf6..a079771d833 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2864,6 +2864,8 @@ extern int immediate_quit;	    /* Nonzero means ^G can quit instantly */
 
 extern POINTER_TYPE *xmalloc P_ ((int));
 extern POINTER_TYPE *xrealloc P_ ((POINTER_TYPE *, int));
+extern void xfree P_ ((POINTER_TYPE *));
+
 extern char *xstrdup P_ ((char *));
 
 extern char *egetenv P_ ((char *));