*** empty log message ***

2 files changed, 40 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5142e9d25bd..1d8ec0bd8c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,36 @@
+2002-05-17  Dave Love  <fx@gnu.org>
+
+        * xterm.c (XSetIMValues): Declare.
+
+        * process.c: Conditionally include sys/wait.h, pty.h.
+
+        * print.c (print_object): Fix print format for 64-bit
+        systems.
+
+        * keyboard.c (modify_event_symbol): Fix print format for 64-bit
+        systems.
+
+        * buffer.c (emacs_strerror): Declare.
+        (MMAP_ALLOCATED_P, mmap_enlarge, syms_of_buffer): Import changes
+        from trunk.
+
+        * fontset.c (Fclear_face_cache): Declare.
+        (accumulate_font_info): Commented-out (unused).
+        (face_for_char, Fset_fontset_font, Ffontset_info): Remove unused
+        variables.
+
+        * character.h (string_escape_byte8): Declare.
+
+        * charset.c (load_charset_map, load_charset_map_from_file): Remove
+        unused vars.
+        (Fdefine_charset_internal, Fsplit_char, syms_of_charset)
+        (Fmap_charset_chars): Doc fix.
+
+        * coding.c (Vchar_coding_system_table, Qchar_coding_system):
+        Removed.
+        (Fset_coding_system_priority, Fset_coding_system_priority) 
+        (Fdefine_coding_system_internal): Doc fix.
+
 2002-05-16  Dave Love  <fx@gnu.org>
 
         * s/osf5-0.h (C_SWITCH_SYSTEM) [!__GNUC__]: Remove -nointrinsics.
diff --git a/src/process.c b/src/process.c
index 4b009e2b076..5ca96d83e9c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -92,6 +92,10 @@ Boston, MA 02111-1307, USA.  */
 #include <sys/sysmacros.h>      /* for "minor" */
 #endif /* not IRIS */
 
+#ifdef HAVE_SYS_WAIT
+#include <sys/wait.h>
+#endif
+
 #include "systime.h"
 #include "systty.h"
 
@@ -234,6 +238,9 @@ static int pty_max_bytes;
 extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system;
 
 #ifdef HAVE_PTYS
+#ifdef HAVE_PTY_H
+#include <pty.h>
+#endif
 /* The file name of the pty opened by allocate_pty.  */
 
 static char pty_name[24];