From 65d965e21b7df0c44b2a57f8768b525036bcc744 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Tue, 18 Jan 2000 05:14:06 +0000
Subject: [PATCH] Eliminate compiler warning.

---
 v7/src/microcode/bchdmp.c       |  4 +--
 v7/src/microcode/bchmmg.c       |  4 +--
 v7/src/microcode/bchutl.c       |  4 +--
 v7/src/microcode/bignum.c       | 16 ++-------
 v7/src/microcode/bintopsb.c     |  5 ++-
 v7/src/microcode/bitstr.c       | 24 ++++++--------
 v7/src/microcode/fasload.c      |  8 +++--
 v7/src/microcode/obstack.h      |  8 ++---
 v7/src/microcode/option.c       | 18 ++++++-----
 v7/src/microcode/osenv.h        | 17 +++++-----
 v7/src/microcode/primutl.c      |  5 ++-
 v7/src/microcode/psbtobin.c     |  8 +++--
 v7/src/microcode/purutl.c       |  7 ++--
 v7/src/microcode/terminfo.c     |  8 +++--
 v7/src/microcode/transact.c     |  9 +++---
 v7/src/microcode/unxutl/ymkfile | 57 ++++++++++++++++++---------------
 v7/src/microcode/ux.h           |  9 ++++--
 v7/src/microcode/uxfs.c         |  6 ++--
 v7/src/microcode/uxproc.c       |  5 +--
 v7/src/microcode/uxsig.c        | 13 ++++++--
 v7/src/microcode/uxsock.c       |  4 +--
 v7/src/microcode/uxterm.c       |  7 ++--
 v7/src/microcode/uxtop.c        |  5 +--
 v7/src/microcode/uxtrap.c       |  8 ++---
 v7/src/microcode/uxutil.c       |  6 ++--
 v7/src/microcode/x11base.c      |  6 ++--
 v7/src/microcode/x11term.c      |  6 ++--
 27 files changed, 149 insertions(+), 128 deletions(-)

diff --git a/v7/src/microcode/bchdmp.c b/v7/src/microcode/bchdmp.c
index 94fb67e1d..dacf83d02 100644
--- a/v7/src/microcode/bchdmp.c
+++ b/v7/src/microcode/bchdmp.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: bchdmp.c,v 9.84 2000/01/18 05:05:57 cph Exp $
+$Id: bchdmp.c,v 9.85 2000/01/18 05:06:26 cph Exp $
 
-Copyright (c) 1987-1999 Massachusetts Institute of Technology
+Copyright (c) 1987-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/v7/src/microcode/bchmmg.c b/v7/src/microcode/bchmmg.c
index 70e66b32e..e2671bf1a 100644
--- a/v7/src/microcode/bchmmg.c
+++ b/v7/src/microcode/bchmmg.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: bchmmg.c,v 9.94 2000/01/18 05:06:06 cph Exp $
+$Id: bchmmg.c,v 9.95 2000/01/18 05:06:34 cph Exp $
 
-Copyright (c) 1987-1999 Massachusetts Institute of Technology
+Copyright (c) 1987-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/v7/src/microcode/bchutl.c b/v7/src/microcode/bchutl.c
index 8f28f1cc4..ba6668b77 100644
--- a/v7/src/microcode/bchutl.c
+++ b/v7/src/microcode/bchutl.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: bchutl.c,v 1.9 2000/01/18 05:06:14 cph Exp $
+$Id: bchutl.c,v 1.10 2000/01/18 05:06:42 cph Exp $
 
-Copyright (c) 1991-1999 Massachusetts Institute of Technology
+Copyright (c) 1991-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/v7/src/microcode/bignum.c b/v7/src/microcode/bignum.c
index 180af8b22..e48120768 100644
--- a/v7/src/microcode/bignum.c
+++ b/v7/src/microcode/bignum.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: bignum.c,v 9.47 1999/01/02 06:11:34 cph Exp $
+$Id: bignum.c,v 9.48 2000/01/18 05:07:03 cph Exp $
 
-Copyright (c) 1989-1999 Massachusetts Institute of Technology
+Copyright (c) 1989-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -120,8 +120,6 @@ static bignum_type EXFUN (bignum_maybe_new_sign,
 			  (bignum_type, int));
 static void EXFUN (bignum_destructive_copy,
 		   (bignum_type, bignum_type));
-static void EXFUN (bignum_destructive_zero,
-		   (bignum_type));
 
 #define ULONG_LENGTH_IN_BITS(digit, len)		\
 do {							\
@@ -1936,13 +1934,3 @@ DEFUN (bignum_destructive_copy, (source, target),
     (*scan_target++) = (*scan_source++);
   return;
 }
-
-static void
-DEFUN (bignum_destructive_zero, (bignum), fast bignum_type bignum)
-{
-  fast bignum_digit_type * scan = (BIGNUM_START_PTR (bignum));
-  fast bignum_digit_type * end = (scan + (BIGNUM_LENGTH (bignum)));
-  while (scan < end)
-    (*scan++) = 0;
-  return;
-}
diff --git a/v7/src/microcode/bintopsb.c b/v7/src/microcode/bintopsb.c
index b434b4083..2fddd95b7 100644
--- a/v7/src/microcode/bintopsb.c
+++ b/v7/src/microcode/bintopsb.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: bintopsb.c,v 9.70 2000/01/18 02:52:54 cph Exp $
+$Id: bintopsb.c,v 9.71 2000/01/18 05:07:46 cph Exp $
 
 Copyright (c) 1987-2000 Massachusetts Institute of Technology
 
@@ -1715,7 +1715,7 @@ DEFUN (print_objects, (from, to),
 	  case GLOBAL_OPERATOR_LINKAGE_KIND:
 	  {
 	    char * word_ptr;
-	    long count, address = 0;
+	    long count = 0;
 	    SCHEME_OBJECT This, * area_end, * scan, * i_scan;
 
 	    i_scan = (from - 1);
@@ -1804,7 +1804,6 @@ DEFUN (print_objects, (from, to),
       
       {
 	unsigned long nmv_length;
-	SCHEME_OBJECT * entry;
 
 	nmv_length = (OBJECT_DATUM (compiled_block_table [the_datum + 1]));
 	fprintf (portable_file, "%02x %lx %lx\n",
diff --git a/v7/src/microcode/bitstr.c b/v7/src/microcode/bitstr.c
index 022c3c466..6978bbd1f 100644
--- a/v7/src/microcode/bitstr.c
+++ b/v7/src/microcode/bitstr.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: bitstr.c,v 9.61 1999/01/02 06:11:34 cph Exp $
+$Id: bitstr.c,v 9.62 2000/01/18 05:08:00 cph Exp $
 
-Copyright (c) 1987-1999 Massachusetts Institute of Technology
+Copyright (c) 1987-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -485,18 +485,14 @@ DEFUN (copy_bits,
       else
 	{
 	  long mask1 = (LOW_MASK (offset1));
-	  long dest_buffer;
-	  {
-	    long mask = (ANY_MASK (head, offset1));
-	    dest_buffer
-	      = (((head + offset1) < OBJECT_LENGTH)
-		 ? ((BIT_STRING_WORD (destination))
-		    &~ (LOW_MASK (head + offset1)))
-		 : 0);
-	    dest_buffer
-	      |= (((* (DEC_BIT_STRING_PTR (source))) & (LOW_MASK (head)))
-		  << offset1);
-	  }
+	  long dest_buffer
+	    = (((head + offset1) < OBJECT_LENGTH)
+	       ? ((BIT_STRING_WORD (destination))
+		  &~ (LOW_MASK (head + offset1)))
+	       : 0);
+	  dest_buffer
+	    |= (((* (DEC_BIT_STRING_PTR (source))) & (LOW_MASK (head)))
+		<< offset1);
 	  nbits -= head;
 	  while (nbits >= OBJECT_LENGTH)
 	    {
diff --git a/v7/src/microcode/fasload.c b/v7/src/microcode/fasload.c
index 022f7b7e3..e749d5b2e 100644
--- a/v7/src/microcode/fasload.c
+++ b/v7/src/microcode/fasload.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: fasload.c,v 9.86 1999/01/02 06:11:34 cph Exp $
+$Id: fasload.c,v 9.87 2000/01/18 05:08:09 cph Exp $
 
-Copyright (c) 1987-1999 Massachusetts Institute of Technology
+Copyright (c) 1987-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -52,7 +52,11 @@ static Tchannel load_channel;
 extern int EXFUN (strlen, (const char *));
 extern char * EXFUN (strcpy, (char *, const char *));
 #endif
+#ifdef __STDC__
+#include <stdlib.h>
+#else
 extern char * EXFUN (malloc, (int));
+#endif
 
 extern char * Error_Names [];
 extern char * Abort_Names [];
diff --git a/v7/src/microcode/obstack.h b/v7/src/microcode/obstack.h
index 33ce94d61..4b8e5dab6 100644
--- a/v7/src/microcode/obstack.h
+++ b/v7/src/microcode/obstack.h
@@ -248,7 +248,7 @@ int obstack_chunk_size (struct obstack *obstack);
    int __len = (length);						\
    ((__o->next_free + __len > __o->chunk_limit)				\
     ? _obstack_newchunk (__o, __len) : 0);				\
-   bcopy (where, __o->next_free, __len);				\
+   memcpy (__o->next_free, where, __len);				\
    __o->next_free += __len;						\
    (void) 0; })
 
@@ -257,7 +257,7 @@ int obstack_chunk_size (struct obstack *obstack);
    int __len = (length);						\
    ((__o->next_free + __len + 1 > __o->chunk_limit)			\
     ? _obstack_newchunk (__o, __len + 1) : 0),				\
-   bcopy (where, __o->next_free, __len),				\
+   memcpy (__o->next_free, where, __len),				\
    __o->next_free += __len,						\
    *(__o->next_free)++ = 0;						\
    (void) 0; })
@@ -344,14 +344,14 @@ int obstack_chunk_size (struct obstack *obstack);
 ( (h)->temp = (length),							\
   (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
    ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
-  bcopy (where, (h)->next_free, (h)->temp),				\
+  memcpy ((h)->next_free, where, (h)->temp),				\
   (h)->next_free += (h)->temp)
 
 #define obstack_grow0(h,where,length)					\
 ( (h)->temp = (length),							\
   (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit)			\
    ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0),			\
-  bcopy (where, (h)->next_free, (h)->temp),				\
+  memcpy ((h)->next_free, where, (h)->temp),				\
   (h)->next_free += (h)->temp,						\
   *((h)->next_free)++ = 0)
 
diff --git a/v7/src/microcode/option.c b/v7/src/microcode/option.c
index dc40f0662..1b1d8b988 100644
--- a/v7/src/microcode/option.c
+++ b/v7/src/microcode/option.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: option.c,v 1.52 2000/01/07 02:20:31 cph Exp $
+$Id: option.c,v 1.53 2000/01/18 05:08:35 cph Exp $
 
 Copyright (c) 1990-2000 Massachusetts Institute of Technology
 
@@ -42,18 +42,20 @@ extern int atoi ();
 #include "ntio.h"
 
 #else /* not WINNT */
-#ifdef _POSIX
 
+#ifdef _POSIX
 #include <unistd.h>
-#include <string.h>
-extern char * EXFUN (malloc, (int));
-
-#else /* not _POSIX */
-
+#else
 extern int strlen ();
+#endif
+
+#ifdef __STDC__
+#include <stdlib.h>
+#include <string.h>
+#else
 extern char * EXFUN (malloc, (int));
+#endif
 
-#endif /* not _POSIX */
 #endif /* not WINNT */
 
 #ifndef NULL
diff --git a/v7/src/microcode/osenv.h b/v7/src/microcode/osenv.h
index ffa63b7f8..ebd0f27cb 100644
--- a/v7/src/microcode/osenv.h
+++ b/v7/src/microcode/osenv.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: osenv.h,v 1.8 1999/01/02 06:11:34 cph Exp $
+$Id: osenv.h,v 1.9 2000/01/18 05:08:46 cph Exp $
 
-Copyright (c) 1990-1999 Massachusetts Institute of Technology
+Copyright (c) 1990-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -38,17 +38,18 @@ struct time_structure
 };
 
 extern time_t EXFUN (OS_encoded_time, ());
-extern void EXFUN (OS_decode_time, (time_t, struct time_structure * ts));
-extern time_t EXFUN (OS_encode_time, (struct time_structure * ts));
+extern void EXFUN (OS_decode_time, (time_t, struct time_structure *));
+extern void EXFUN (OS_decode_utc, (time_t, struct time_structure *));
+extern time_t EXFUN (OS_encode_time, (struct time_structure *));
 extern double EXFUN (OS_process_clock, (void));
 extern double EXFUN (OS_real_time_clock, (void));
-extern void EXFUN (OS_process_timer_set, (clock_t first, clock_t interval));
+extern void EXFUN (OS_process_timer_set, (clock_t, clock_t));
 extern void EXFUN (OS_process_timer_clear, (void));
-extern void EXFUN (OS_profile_timer_set, (clock_t first, clock_t interval));
+extern void EXFUN (OS_profile_timer_set, (clock_t, clock_t));
 extern void EXFUN (OS_profile_timer_clear, (void));
-extern void EXFUN (OS_real_timer_set, (clock_t first, clock_t interval));
+extern void EXFUN (OS_real_timer_set, (clock_t, clock_t));
 extern void EXFUN (OS_real_timer_clear, (void));
 extern CONST char * EXFUN (OS_working_dir_pathname, (void));
-extern void EXFUN (OS_set_working_dir_pathname, (CONST char * name));
+extern void EXFUN (OS_set_working_dir_pathname, (CONST char *));
 
 #endif /* SCM_OSENV_H */
diff --git a/v7/src/microcode/primutl.c b/v7/src/microcode/primutl.c
index 32aa953d7..3b93749fd 100644
--- a/v7/src/microcode/primutl.c
+++ b/v7/src/microcode/primutl.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: primutl.c,v 9.71 1999/01/02 06:11:34 cph Exp $
+$Id: primutl.c,v 9.72 2000/01/18 05:08:57 cph Exp $
 
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -164,7 +164,6 @@ static Boolean
 DEFUN_VOID (grow_primitive_tables)
 {
   Boolean result;
-  long old_prim_table_size = prim_table_size;
 
   prim_table_size = (MAX_PRIMITIVE + (MAX_PRIMITIVE / 10));
 
diff --git a/v7/src/microcode/psbtobin.c b/v7/src/microcode/psbtobin.c
index 29d43fff6..e544e624a 100644
--- a/v7/src/microcode/psbtobin.c
+++ b/v7/src/microcode/psbtobin.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: psbtobin.c,v 9.57 1999/01/02 06:06:43 cph Exp $
+$Id: psbtobin.c,v 9.58 2000/01/18 05:09:07 cph Exp $
 
-Copyright (c) 1987-1999 Massachusetts Institute of Technology
+Copyright (c) 1987-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -402,7 +402,7 @@ DEFUN (read_a_bit_string, (To, Slot),
     unsigned long temp;
     fast SCHEME_OBJECT *scan;
     fast long bits_remaining, bits_accumulated;
-    fast SCHEME_OBJECT accumulator, next_word;
+    fast SCHEME_OBJECT accumulator;
 
     accumulator = 0;
     bits_accumulated = 0;
@@ -1506,6 +1506,7 @@ static struct keyword_struct
     END_KEYWORD ()
     };
 
+int
 DEFUN (main, (argc, argv),
        int argc AND
        char **argv)
@@ -1520,4 +1521,5 @@ DEFUN (main, (argc, argv),
   setup_io ("r", "wb");
   do_it ();
   quit (0);
+  return (0);
 }
diff --git a/v7/src/microcode/purutl.c b/v7/src/microcode/purutl.c
index e4e5503d8..89fa55f2f 100644
--- a/v7/src/microcode/purutl.c
+++ b/v7/src/microcode/purutl.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: purutl.c,v 9.49 1999/01/02 06:11:34 cph Exp $
+$Id: purutl.c,v 9.50 2000/01/18 05:09:17 cph Exp $
 
-Copyright (c) 1987-1999 Massachusetts Institute of Technology
+Copyright (c) 1987-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -26,9 +26,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "gccode.h"
 #include "zones.h"
 
-#ifdef WINNT
+#ifdef __STDC__
 #include <stdlib.h>
-#include <malloc.h>
 #endif
 
 static void
diff --git a/v7/src/microcode/terminfo.c b/v7/src/microcode/terminfo.c
index 1a70b4231..e711662c1 100644
--- a/v7/src/microcode/terminfo.c
+++ b/v7/src/microcode/terminfo.c
@@ -2,7 +2,7 @@
    Copyright (C) 1985, 1986 Free Software Foundation, Inc.
    Copyright (C) 1998 Massachusetts Institute of Technology
 
-$Id: terminfo.c,v 1.2 1998/07/20 04:37:36 cph Exp $
+$Id: terminfo.c,v 1.3 2000/01/18 05:09:25 cph Exp $
 
 This file is part of GNU Emacs.
 
@@ -27,13 +27,15 @@ and this notice must be preserved on all copies.  */
 
 #include "oscond.h"
 
+#ifdef __STDC__
+#include <stdlib.h>
+#endif
+
 #ifndef _IRIX
 char *UP, *BC, PC;
 short ospeed;
 #endif
 
-static buffer[512];
-
 /* Interface to curses/terminfo library.
    Turns out that all of the terminfo-level routines look
    like their termcap counterparts except for tparm, which replaces
diff --git a/v7/src/microcode/transact.c b/v7/src/microcode/transact.c
index 05093c697..e25332eb5 100644
--- a/v7/src/microcode/transact.c
+++ b/v7/src/microcode/transact.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: transact.c,v 1.3 1999/01/03 05:33:46 cph Exp $
+$Id: transact.c,v 1.4 2000/01/18 05:09:40 cph Exp $
 
-Copyright (C) 1990-1999 Massachusetts Institute of Technology
+Copyright (C) 1990-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -51,8 +51,9 @@ DEFUN (guarantee_current_transaction, (proc), CONST char * proc)
     error (proc, "no transaction");
   switch (current_transaction -> state)
     {
-    case committing: error (proc, "commit in progress");
-    case aborting: error (proc, "abort in progress");
+    case committing: error (proc, "commit in progress"); break;
+    case aborting: error (proc, "abort in progress"); break;
+    case active: break;
     }
 }
 
diff --git a/v7/src/microcode/unxutl/ymkfile b/v7/src/microcode/unxutl/ymkfile
index 02590256f..e09141960 100644
--- a/v7/src/microcode/unxutl/ymkfile
+++ b/v7/src/microcode/unxutl/ymkfile
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: ymkfile,v 1.95 1999/05/11 03:34:14 cph Exp $
+$Id: ymkfile,v 1.96 2000/01/18 05:14:06 cph Exp $
 
-Copyright (c) 1989-1999 Massachusetts Institute of Technology
+Copyright (c) 1989-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -284,7 +284,7 @@ compinit.o : compinit.c liarc.tch compinit.h
    to prevent fgrep from reading stdin.
  */
 compinit.h : $(COMPILED_SOURCES) liarc.tch xmkfile
-	@echo "#*** Generating" $@ "because of" $?
+	/* @echo "#*** Generating" $@ "because of" $? */
 	rm -f $@
 	fgrep DECLARE_COMPILED_CODE liarc.tch $(COMPILED_SOURCES) | \
 	sed -e 's/.*:/  /' -e 's/)/);/' > $@
@@ -293,7 +293,7 @@ compinit.h : $(COMPILED_SOURCES) liarc.tch xmkfile
 
 foo $(COMPILED_OBJECTS) : liarc.tch
 liarc.tch: liarc.h $(LIARC_HEAD_FILES)
-	@echo "#** Generating" $@ because of $?
+	/* @echo "#** Generating" $@ because of $? */
 	rm -f $@
 	echo "touch" > $@
 
@@ -360,23 +360,28 @@ CFLAGS = -DMIT_SCHEME C_OPTIMIZE_SWITCH C_DEBUG_SWITCH C_SWITCH_MACHINE C_SWITCH
 
 .SUFFIXES: .o .cpp .s .m4
 
-.c.o: ; @ECHO "#** Generating" $@ because of $?
+.c.o:
+	/* @ECHO "#** Generating" $@ because of $? */
 	$(CC) $(CFLAGS) -c $*.c
 
-.c.cpp: ; @ECHO "#** Generating" $@
+.c.cpp:
+	/* @ECHO "#** Generating" $@ */
 	make -f xmkfile breakup
 	$(CC) $(CFLAGS) -E $*.c | \
 	RUN(breakup) | \
 	sed -e 's/^#.*//' -e 's/^[ 	]*$$//' -e 's/^$$//' | \
 	sed -n -e '/^..*/p' > $*.cpp
 
-.c.s: ; @ECHO "#** Generating" $@
+.c.s:
+	/* @ECHO "#** Generating" $@ */
 	$(CC) $(CFLAGS) -S $*.c
 
-.m4.s: ; @ECHO "#** Generating" $@ because of $?
+.m4.s:
+	/* @ECHO "#** Generating" $@ because of $? */
 	$(M4) M4_SWITCH_SYSTEM M4_SWITCH_MACHINE $*.m4 > $*.s
 
-.s.o: ; @ECHO "#** Generating" $@ because of $?
+.s.o:
+	/* @ECHO "#** Generating" $@ because of $? */
 	$(AS) AS_SWITCH_SYSTEM AS_SWITCH_MACHINE -o $*.o $*.s
 
 /* Source and object files */
@@ -588,42 +593,42 @@ BCHOBJECTS = $(CORE_OBJECTS) $(BCH_GC_OBJECTS) $(UNIX_OBJECTS) $(OS_PRIM_OBJECTS
 all: bintopsb psbtobin scheme bchscheme bchdrn $(XTRA_TARGETS)
 
 scheme xscheme : $(OBJECTS) $(SCHEME_OBJECTS)
-	@ECHO "#** Re-linking" $@ because of $?
+	/* @ECHO "#** Re-linking" $@ because of $? */
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(SCHEME_OBJECTS) $(SCHEME_LIB)
 
 bchscheme : $(BCHOBJECTS) $(SCHEME_OBJECTS)
-	@ECHO "#** Re-linking" $@ because of $?
+	/* @ECHO "#** Re-linking" $@ because of $? */
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ $(BCHOBJECTS) $(SCHEME_OBJECTS) $(SCHEME_LIB)
 
 bchdrn : bchdrn.o bchutl.o
-	@ECHO "#** Re-linking" $@ because of $?
+	/* @ECHO "#** Re-linking" $@ because of $? */
 	rm -f $@
 	$(CC) $(LDFLAGS) -o $@ bchdrn.o bchutl.o
 
 findprim : findprim.o
-	@ECHO "#** Re-linking" $@ because of $?
+	/* @ECHO "#** Re-linking" $@ because of $? */
 	$(CC) $(LDFLAGS) -o $@ findprim.o
 
 bintopsb : bintopsb.o missing.o
-	@ECHO "#** Re-linking" $@ because of $?
+	/* @ECHO "#** Re-linking" $@ because of $? */
 	$(CC) $(LDFLAGS) -o $@ bintopsb.o missing.o LIB_MATH
 
 psbtobin : psbtobin.o missing.o
-	@ECHO "#** Re-linking" $@ because of $?
+	/* @ECHO "#** Re-linking" $@ because of $? */
 	$(CC) $(LDFLAGS) -o $@ psbtobin.o missing.o LIB_MATH
 
 breakup : breakup.o
-	@ECHO "#** Re-linking" $@ because of $?
+	/* @ECHO "#** Re-linking" $@ because of $? */
 	$(CC) $(LDFLAGS) -o $@ breakup.o
 
 wsize : wsize.o
-	@ECHO "#** Re-linking" $@ because of $?
+	/* @ECHO "#** Re-linking" $@ because of $? */
 	$(CC) $(LDFLAGS) -o $@ wsize.o LIB_MATH LIBS_SYSTEM LIBS_MACHINE LIB_DEBUG LIB_STANDARD
 
 ppband : ppband.o
-	@ECHO "#** Re-linking" $@ because of $?
+	/* @ECHO "#** Re-linking" $@ because of $? */
 	$(CC) $(LDFLAGS) -o $@ ppband.o
 
 install: scheme bchscheme
@@ -646,12 +651,12 @@ vmsusrdef.c :
 	$(CC) $(CFLAGS) -c usrdef.c
 
 usrdef.c : $(SCHEME_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
-	@ECHO "#** Re-making" $@ because of $?
+	/* @ECHO "#** Re-making" $@ because of $? */
 	rm -f usrdef.c
 	RUN(findprim) $(SCHEME_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrdef.c
 
 bchdef.c : $(SCHEME_SOURCES) $(BCHSOURCES) $(OS_PRIM_SOURCES) usrdef.tch findprim xmkfile
-	@ECHO "#** Re-making" $@ because of $?
+	/* @ECHO "#** Re-making" $@ because of $? */
 	rm -f bchdef.c
 	RUN(findprim) $(SCHEME_SOURCES) $(BCHSOURCES) $(OS_PRIM_SOURCES) > bchdef.c
 
@@ -659,7 +664,7 @@ primitive_tables :
 	rm -f usrdef.c usrdef.o bchdef.c bchdef.o
 
 scheme.tch psbmap.tch usrdef.tch :
-	@ECHO "#** Resetting" $@ because of $?
+	/* @ECHO "#** Resetting" $@ because of $? */
 	rm -f $@
 	/* Create the file by opening rather than using `touch' program.
 	   Some versions of the `touch' program don't work well when the
@@ -758,7 +763,7 @@ term.o : scheme.tch
 missing.o : config.h
 
 BCHGCC_H = bchgcc.h oscond.h $(GC_HEAD_FILES)
-bchdmp.o : scheme.tch prims.h uxio.h osio.h osfile.h trap.h lookup.h \
+bchdmp.o : scheme.tch prims.h uxio.h osio.h osfile.h osfs.h trap.h lookup.h \
 	$(BCHGCC_H) fasl.h dump.c
 bchdrn.o : ansidecl.h bchdrn.h
 bchmmg.o : scheme.tch prims.h memmag.h ux.h $(BCHGCC_H) option.h bchdrn.h memmag.h
@@ -799,15 +804,15 @@ $(UNIX_OBJECTS) pruxenv.o pruxfs.o pruxio.o pruxsock.o : oscond.h ansidecl.h \
 uxctty.o : osctty.h ossig.h
 uxenv.o : ux.h osenv.h config.h
 uxfile.o : osfile.h osio.h uxio.h
-uxfs.o : osfs.h
+uxfs.o : osfs.h osfile.h osio.h
 uxio.o : osio.h uxio.h uxselect.h
-uxproc.o : osproc.h uxproc.h osio.h uxio.h osterm.h
-uxsig.o : config.h ux.h ossig.h osctty.h ostty.h uxtrap.h uxsig.h \
+uxproc.o : osproc.h uxproc.h osio.h uxio.h osterm.h ostop.h
+uxsig.o : config.h ux.h ossig.h osctty.h ostty.h ostop.h uxtrap.h uxsig.h \
           uxutil.h critsec.h
 uxsock.o : uxsock.h osio.h uxio.h prims.h
 uxterm.o : osterm.h uxterm.h osio.h uxio.h ospty.h
 uxtop.o : ostop.h uxtop.h osctty.h uxutil.h errors.h option.h
-uxtrap.o : scheme.tch uxtrap.h uxutil.h option.h $(GC_HEAD_FILES)
+uxtrap.o : scheme.tch uxtrap.h uxutil.h option.h ostop.h $(GC_HEAD_FILES)
 uxtty.o : ostty.h osenv.h osio.h uxio.h osterm.h uxterm.h
 uxutil.o : uxutil.h
 pruxfs.o : osfs.h
diff --git a/v7/src/microcode/ux.h b/v7/src/microcode/ux.h
index 32f89abed..7eea46136 100644
--- a/v7/src/microcode/ux.h
+++ b/v7/src/microcode/ux.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: ux.h,v 1.72 1999/04/07 04:01:47 cph Exp $
+$Id: ux.h,v 1.73 2000/01/18 05:09:49 cph Exp $
 
-Copyright (c) 1988-1999 Massachusetts Institute of Technology
+Copyright (c) 1988-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -42,6 +42,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <pwd.h>
 #include <grp.h>
 
+#ifdef __STDC__
+#include <stdlib.h>
+#include <string.h>
+#endif
+
 extern int errno;
 
 /* These seem to be missing from versions of unistd.h */
diff --git a/v7/src/microcode/uxfs.c b/v7/src/microcode/uxfs.c
index 3f215e591..98d4bc5a7 100644
--- a/v7/src/microcode/uxfs.c
+++ b/v7/src/microcode/uxfs.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: uxfs.c,v 1.18 1999/12/21 18:48:34 cph Exp $
+$Id: uxfs.c,v 1.19 2000/01/18 05:09:59 cph Exp $
 
-Copyright (c) 1990-1999 Massachusetts Institute of Technology
+Copyright (c) 1990-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "ux.h"
 #include "osfs.h"
+#include "osfile.h"
+#include "osio.h"
 
 #ifdef HAVE_STATFS
 #include <sys/vfs.h>
diff --git a/v7/src/microcode/uxproc.c b/v7/src/microcode/uxproc.c
index 28c174f79..f9884e00e 100644
--- a/v7/src/microcode/uxproc.c
+++ b/v7/src/microcode/uxproc.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: uxproc.c,v 1.23 1999/01/02 06:11:34 cph Exp $
+$Id: uxproc.c,v 1.24 2000/01/18 05:10:07 cph Exp $
 
-Copyright (c) 1990-1999 Massachusetts Institute of Technology
+Copyright (c) 1990-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "uxproc.h"
 #include "uxio.h"
 #include "osterm.h"
+#include "ostop.h"
 
 #ifndef HAVE_DUP2
 #include "error: can't hack subprocess I/O without dup2() or equivalent"
diff --git a/v7/src/microcode/uxsig.c b/v7/src/microcode/uxsig.c
index 782942ec4..34fe99401 100644
--- a/v7/src/microcode/uxsig.c
+++ b/v7/src/microcode/uxsig.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: uxsig.c,v 1.33 1999/01/02 06:11:34 cph Exp $
+$Id: uxsig.c,v 1.34 2000/01/18 05:10:22 cph Exp $
 
-Copyright (c) 1990-1999 Massachusetts Institute of Technology
+Copyright (c) 1990-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,10 +24,17 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "ossig.h"
 #include "osctty.h"
 #include "ostty.h"
+#include "ostop.h"
 #include "uxtrap.h"
 #include "uxsig.h"
 #include "uxutil.h"
 #include "critsec.h"
+
+extern cc_t EXFUN (OS_ctty_quit_char, (void));
+extern cc_t EXFUN (OS_ctty_int_char, (void));
+extern cc_t EXFUN (OS_ctty_tstp_char, (void));
+extern cc_t EXFUN (OS_ctty_disabled_char, (void));
+extern void EXFUN (tty_set_next_interrupt_char, (cc_t c));
 
 /* Signal Manipulation */
 
@@ -673,6 +680,8 @@ DEFUN_VOID (UX_initialize_signals)
 	    case dfl_stop:
 	      bind_handler ((scan -> signo), sighnd_stop);
 	      break;
+	    case dfl_ignore:
+	      break;
 	    }
 	scan += 1;
       }
diff --git a/v7/src/microcode/uxsock.c b/v7/src/microcode/uxsock.c
index 1e2d64a7d..51e6a0597 100644
--- a/v7/src/microcode/uxsock.c
+++ b/v7/src/microcode/uxsock.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: uxsock.c,v 1.22 2000/01/18 02:52:40 cph Exp $
+$Id: uxsock.c,v 1.23 2000/01/18 05:10:32 cph Exp $
 
 Copyright (c) 1990-2000 Massachusetts Institute of Technology
 
@@ -38,6 +38,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #if 0
 extern struct servent * EXFUN (getservbyname, (CONST char *, CONST char *));
 extern struct hostent * EXFUN (gethostbyname, (CONST char *));
+extern char * EXFUN (strncpy, (char *, CONST char *, size_t));
 #endif
 
 Tchannel
@@ -162,7 +163,6 @@ DEFUN (OS_open_unix_stream_socket, (filename), CONST char * filename)
 {
 #ifdef HAVE_UNIX_SOCKETS
   int s;
-  extern char * EXFUN (strncpy, (char *, CONST char *, size_t));
   Tchannel channel;
 
   transaction_begin ();
diff --git a/v7/src/microcode/uxterm.c b/v7/src/microcode/uxterm.c
index dcc230a40..3cb4a7a6f 100644
--- a/v7/src/microcode/uxterm.c
+++ b/v7/src/microcode/uxterm.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: uxterm.c,v 1.26 1999/01/02 06:11:34 cph Exp $
+$Id: uxterm.c,v 1.27 2000/01/18 05:10:50 cph Exp $
 
-Copyright (c) 1990-1999 Massachusetts Institute of Technology
+Copyright (c) 1990-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,6 +24,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "uxio.h"
 #include "ospty.h"
 
+extern long EXFUN (arg_nonnegative_integer, (int));
+extern long EXFUN (arg_index_integer, (int, long));
+
 #if defined(HAVE_TERMIOS) || defined(HAVE_TERMIO)
 
 #ifndef ISTRIP
diff --git a/v7/src/microcode/uxtop.c b/v7/src/microcode/uxtop.c
index 40871b2d6..80cf0b971 100644
--- a/v7/src/microcode/uxtop.c
+++ b/v7/src/microcode/uxtop.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: uxtop.c,v 1.22 1999/04/07 04:01:49 cph Exp $
+$Id: uxtop.c,v 1.23 2000/01/18 05:11:00 cph Exp $
 
-Copyright (c) 1990-1999 Massachusetts Institute of Technology
+Copyright (c) 1990-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -44,6 +44,7 @@ extern void EXFUN (UX_reset_processes, (void));
 extern void EXFUN (UX_reset_terminals, (void));
 extern void EXFUN (execute_reload_cleanups, (void));
 
+extern cc_t EXFUN (OS_ctty_quit_char, (void));
 extern void EXFUN (UX_ctty_save_external_state, (void));
 extern void EXFUN (UX_ctty_save_internal_state, (void));
 extern void EXFUN (UX_ctty_restore_internal_state, (void));
diff --git a/v7/src/microcode/uxtrap.c b/v7/src/microcode/uxtrap.c
index ccc3a02b1..f0cc824ab 100644
--- a/v7/src/microcode/uxtrap.c
+++ b/v7/src/microcode/uxtrap.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: uxtrap.c,v 1.28 1999/01/02 06:11:34 cph Exp $
+$Id: uxtrap.c,v 1.29 2000/01/18 05:11:09 cph Exp $
 
-Copyright (c) 1990-1999 Massachusetts Institute of Technology
+Copyright (c) 1990-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "uxtrap.h"
 #include "uxutil.h"
 #include "option.h"
+#include "ostop.h"
 
 extern CONST char * EXFUN (find_signal_name, (int signo));
 extern void EXFUN (UX_dump_core, (void));
@@ -575,8 +576,6 @@ DEFUN (continue_from_trap, (signo, info, scp),
     }
     else
     {
-      long primitive_address =
-	((long) (Primitive_Procedure_Table[OBJECT_DATUM (primitive)]));
       (trinfo . state) = STATE_PRIMITIVE;
       (trinfo . pc_info_1) = primitive;
       (trinfo . pc_info_2) =
@@ -808,7 +807,6 @@ DEFUN (find_ccblock, (the_pc),
   {
     /* In compiled code. */
     SCHEME_OBJECT * block_addr;
-    SCHEME_OBJECT * maybe_free;
     block_addr =
       (pc_in_builtin
        ? ((SCHEME_OBJECT *) NULL)
diff --git a/v7/src/microcode/uxutil.c b/v7/src/microcode/uxutil.c
index 075a89e9e..990e109b0 100644
--- a/v7/src/microcode/uxutil.c
+++ b/v7/src/microcode/uxutil.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: uxutil.c,v 1.6 1999/01/02 06:11:34 cph Exp $
+$Id: uxutil.c,v 1.7 2000/01/18 05:11:28 cph Exp $
 
-Copyright (c) 1990, 1991, 1999 Massachusetts Institute of Technology
+Copyright (c) 1990, 1991, 1999, 2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include "ux.h"
 #include "uxutil.h"
 #include <ctype.h>
+
+extern void EXFUN (terminal_state_raw, (Ttty_state *, int));
 
 static CONST char *
 DEFUN (char_description_brief, (c), unsigned char c)
diff --git a/v7/src/microcode/x11base.c b/v7/src/microcode/x11base.c
index 5de9b5258..e43730280 100644
--- a/v7/src/microcode/x11base.c
+++ b/v7/src/microcode/x11base.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: x11base.c,v 1.73 1999/01/02 06:11:34 cph Exp $
+$Id: x11base.c,v 1.74 2000/01/18 05:11:37 cph Exp $
 
-Copyright (c) 1989-1999 Massachusetts Institute of Technology
+Copyright (c) 1989-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -256,6 +256,7 @@ DEFUN (x_io_error_handler, (display), Display * display)
 #else
   termination_eof ();
 #endif
+  return (0);
 }
 
 static int
@@ -276,6 +277,7 @@ DEFUN (x_error_handler, (display, error_event),
 #else
   termination_eof ();
 #endif
+  return (0);
 }
 
 typedef int EXFUN ((* x_error_handler_t), (Display *, XErrorEvent *));
diff --git a/v7/src/microcode/x11term.c b/v7/src/microcode/x11term.c
index c1713b5d3..092c19b65 100644
--- a/v7/src/microcode/x11term.c
+++ b/v7/src/microcode/x11term.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: x11term.c,v 1.25 1999/01/02 06:11:34 cph Exp $
+$Id: x11term.c,v 1.26 2000/01/18 05:11:46 cph Exp $
 
-Copyright (c) 1989-1999 Massachusetts Institute of Technology
+Copyright (c) 1989-2000 Massachusetts Institute of Technology
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -665,7 +665,7 @@ DEFINE_PRIMITIVE ("XTERM-WRITE-CHAR!", Prim_xterm_write_char, 5, 5, 0)
     char * map_ptr = (XTERM_CHAR_LOC (xw, index));
     (*map_ptr) = c;
     (XTERM_HL (xw, index)) = hl;
-    XTERM_DRAW_CHARS (xw, x, y, map_ptr, 1, (XTERM_HL_GC (xw, (xw, hl))));
+    XTERM_DRAW_CHARS (xw, x, y, map_ptr, 1, (XTERM_HL_GC (xw, hl)));
     if (((XW_CURSOR_X (xw)) == x) && ((XW_CURSOR_Y (xw)) == y))
       {
 	(XW_CURSOR_VISIBLE_P (xw)) = 0;
-- 
2.25.1