Many small changes to eliminate errors and warnings when compiling

under Win32 using either Visual C++ 4.0 or Watcom C/C++ 10.6.

diff --git a/v7/src/microcode/bitstr.c b/v7/src/microcode/bitstr.c
index 47d28889681d4304374af42efde58fab354b3619..0ff6f230c6a03dfa05a30175873be7c3618ed06a 100644 (file)
--- a/v7/src/microcode/bitstr.c
+++ b/v7/src/microcode/bitstr.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: bitstr.c,v 9.58 1996/10/02 21:14:10 cph Exp $
+$Id: bitstr.c,v 9.59 1996/10/02 21:16:23 cph Exp $
 
 Copyright (c) 1987-96 Massachusetts Institute of Technology
 
@@ -624,7 +624,6 @@ DEFUN (bignum_to_bit_string, (length, bignum),
       if (! (bignum_fits_in_word_p (bignum, length, 0)))
        error_bad_range_arg (2);
       {
-       void EXFUN (btbs_consumer, (unsigned char **, long));
        SCHEME_OBJECT result = (zero_to_bit_string (length));
        unsigned char * result_ptr =
          ((unsigned char *) (BIT_STRING_LOW_PTR (result)));
@@ -655,7 +654,6 @@ SCHEME_OBJECT
 DEFUN (bit_string_to_bignum, (nbits, bitstr),
        long nbits AND SCHEME_OBJECT bitstr)
 {
-  unsigned int EXFUN (bstb_producer, (struct bitstr_to_bignm_context *));
   struct bitstr_to_bignm_context context;
   int ndigits, skip;
 

diff --git a/v7/src/microcode/pruxfs.c b/v7/src/microcode/pruxfs.c
index 3f04fcdae5ce8a46f293c500502744cee93090a7..73ac28ffe63f190fbf691fc48e28f1c0916a3e57 100644 (file)
--- a/v7/src/microcode/pruxfs.c
+++ b/v7/src/microcode/pruxfs.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: pruxfs.c,v 9.53 1996/10/02 21:13:59 cph Exp $
+$Id: pruxfs.c,v 9.54 1996/10/02 21:18:08 cph Exp $
 
 Copyright (c) 1987-96 Massachusetts Institute of Technology
 
@@ -424,8 +424,7 @@ DEFINE_PRIMITIVE ("FILE-SYSTEM-TYPE", Prim_file_system_type, 1, 1, 0)
   {
     CONST char * result = (UX_file_system_type (STRING_ARG (1)));
     PRIMITIVE_RETURN
-      (char_pointer_to_string ((result == 0)
-                              ? "unknown"
-                              : ((unsigned char *) result)));
+      (char_pointer_to_string
+       ((unsigned char *) ((result == 0) ? "unknown" : result)));
   }
 }