From 0fd6165567ff000d8d9790d6db041ce10aec45a3 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 26 Jun 1997 06:59:54 +0000
Subject: [PATCH] Watcom 11: eliminate compiler warning.

---
 v7/src/microcode/bintopsb.c | 4 +---
 v7/src/microcode/hooks.c    | 5 +++--
 v7/src/microcode/lookup.c   | 4 +++-
 v7/src/microcode/ntenv.c    | 6 +++---
 v7/src/microcode/ntfs.c     | 6 +++---
 v7/src/microcode/ntgui.c    | 6 +++---
 v7/src/microcode/ntsys.c    | 4 ++--
 v7/src/microcode/ntsys.h    | 6 +++---
 v7/src/microcode/utils.c    | 4 +++-
 9 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/v7/src/microcode/bintopsb.c b/v7/src/microcode/bintopsb.c
index 9c6529e99..bc6757545 100644
--- a/v7/src/microcode/bintopsb.c
+++ b/v7/src/microcode/bintopsb.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: bintopsb.c,v 9.66 1997/01/02 05:23:15 cph Exp $
+$Id: bintopsb.c,v 9.67 1997/06/26 06:57:56 cph Exp $
 
 Copyright (c) 1987-97 Massachusetts Institute of Technology
 
@@ -1425,7 +1425,6 @@ DEFUN (Process_Area, (Code, Area, Bound, Obj, FObj),
 	/* Fall Through */
 
       case TC_CHARACTER:
-      Process_Character:
         Mem_Base[*Area] = (MAKE_OBJECT (Code, *Obj));
         *Obj += 1;
         **FObj = This;
@@ -1522,7 +1521,6 @@ DEFUN (Process_Area, (Code, Area, Bound, Obj, FObj),
 	break;
 
       default:
-      Bad_Type:
 	fprintf (stderr, "%s: Unknown Type Code 0x%x found.\n",
 		 program_name, (OBJECT_TYPE (This)));
 	quit (1);
diff --git a/v7/src/microcode/hooks.c b/v7/src/microcode/hooks.c
index c5b1c5569..9478e36a0 100644
--- a/v7/src/microcode/hooks.c
+++ b/v7/src/microcode/hooks.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: hooks.c,v 9.56 1997/01/02 05:21:37 cph Exp $
+$Id: hooks.c,v 9.57 1997/06/26 06:59:54 cph Exp $
 
 Copyright (c) 1988-97 Massachusetts Institute of Technology
 
@@ -480,6 +480,7 @@ memoized yet.")
      Pushed ();
       PRIMITIVE_ABORT (PRIM_APPLY);
       /*NOTREACHED*/
+      PRIMITIVE_RETURN (UNSPECIFIC);
     }
     else
     {
@@ -495,7 +496,7 @@ memoized yet.")
       Store_Expression (FAST_MEMORY_REF (thunk, THUNK_PROCEDURE));
       PRIMITIVE_ABORT (PRIM_DO_EXPRESSION);
       /*NOTREACHED*/
-      return (0);
+      PRIMITIVE_RETURN (UNSPECIFIC);
     }
   }
 }
diff --git a/v7/src/microcode/lookup.c b/v7/src/microcode/lookup.c
index 41a05b022..1f7183aca 100644
--- a/v7/src/microcode/lookup.c
+++ b/v7/src/microcode/lookup.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: lookup.c,v 9.55 1996/10/02 19:01:34 cph Exp $
+$Id: lookup.c,v 9.56 1997/06/26 06:57:41 cph Exp $
 
 Copyright (c) 1988-96 Massachusetts Institute of Technology
 
@@ -1606,7 +1606,9 @@ DEFUN (compiler_cache,
   store_extension = SHARP_F;
   trap_kind = TRAP_COMPILER_CACHED;
 
+#if 0
 compiler_cache_retry:
+#endif
 
   setup_lock (set_serializer, cell);
   compiler_cache_consistency_check ();
diff --git a/v7/src/microcode/ntenv.c b/v7/src/microcode/ntenv.c
index 10e07fa3c..43f83de98 100644
--- a/v7/src/microcode/ntenv.c
+++ b/v7/src/microcode/ntenv.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntenv.c,v 1.15 1997/01/01 22:57:20 cph Exp $
+$Id: ntenv.c,v 1.16 1997/06/26 06:59:40 cph Exp $
 
 Copyright (c) 1992-97 Massachusetts Institute of Technology
 
@@ -433,10 +433,10 @@ DEFUN_VOID (OS_working_dir_pathname)
 }
 
 void
-DEFUN (OS_set_working_dir_pathname, (name), char * name)
+DEFUN (OS_set_working_dir_pathname, (name), CONST char * name)
 {
   size_t name_size = (strlen (name));
-  char * filename = name;
+  CONST char * filename = name;
 
   STD_BOOL_API_CALL (SetCurrentDirectory, (filename));
 
diff --git a/v7/src/microcode/ntfs.c b/v7/src/microcode/ntfs.c
index 6adc6e0de..6b160fb4d 100644
--- a/v7/src/microcode/ntfs.c
+++ b/v7/src/microcode/ntfs.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntfs.c,v 1.14 1997/01/05 23:38:50 cph Exp $
+$Id: ntfs.c,v 1.15 1997/06/26 06:59:31 cph Exp $
 
 Copyright (c) 1992-97 Massachusetts Institute of Technology
 
@@ -57,7 +57,7 @@ DEFUN (NT_read_file_status, (name, s),
 }
 
 enum file_existence
-DEFUN (OS_file_existence_test, (name), char * name)
+DEFUN (OS_file_existence_test, (name), CONST char * name)
 {
   struct stat s;
   char filename[128];
@@ -76,7 +76,7 @@ DEFUN (OS_file_access, (name, mode), CONST char * name AND unsigned int mode)
 }
 
 int
-DEFUN (OS_file_directory_p, (name), char * name)
+DEFUN (OS_file_directory_p, (name), CONST char * name)
 {
   struct stat s;
   char filename[128];
diff --git a/v7/src/microcode/ntgui.c b/v7/src/microcode/ntgui.c
index cd2ca458d..df0fa150c 100644
--- a/v7/src/microcode/ntgui.c
+++ b/v7/src/microcode/ntgui.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: ntgui.c,v 1.19 1997/03/18 04:06:32 cph Exp $
+$Id: ntgui.c,v 1.20 1997/06/26 06:59:20 cph Exp $
 
-Copyright (c) 1993-96 Massachusetts Institute of Technology
+Copyright (c) 1993-97 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -97,7 +97,7 @@ WinMain (HANDLE hInst, HANDLE hPrevInst, LPSTR lpCmdLine, int nCmdShow)
     if (!InitInstance(ghInstance, nCmdShow))
       return  FALSE;
 
-    scheme_main (argc, argv);
+    scheme_main (argc, ((const char **) argv));
     return (0);
 }
 #endif
diff --git a/v7/src/microcode/ntsys.c b/v7/src/microcode/ntsys.c
index 4b1e45a82..ee29c8798 100644
--- a/v7/src/microcode/ntsys.c
+++ b/v7/src/microcode/ntsys.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntsys.c,v 1.7 1997/01/02 05:21:39 cph Exp $
+$Id: ntsys.c,v 1.8 1997/06/26 06:59:03 cph Exp $
 
 Copyright (c) 1992-97 Massachusetts Institute of Technology
 
@@ -49,7 +49,7 @@ nt_console_write (void * vbuffer, size_t nsize)
 }
 
 BOOL
-nt_pathname_as_filename (char * name, char * buffer)
+nt_pathname_as_filename (const char * name, char * buffer)
 { /* Returns whether directory encountered is top level */
   int end_index = ((strlen (name)) - 1);
 
diff --git a/v7/src/microcode/ntsys.h b/v7/src/microcode/ntsys.h
index aeb9c8f2f..25d4e4a38 100644
--- a/v7/src/microcode/ntsys.h
+++ b/v7/src/microcode/ntsys.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: ntsys.h,v 1.6 1996/04/09 20:16:08 adams Exp $
+$Id: ntsys.h,v 1.7 1997/06/26 06:58:54 cph Exp $
 
-Copyright (c) 1992-1996 Massachusetts Institute of Technology
+Copyright (c) 1992-97 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -39,6 +39,6 @@ MIT in each case. */
 
 extern BOOL win32_under_win32s_p ();
 extern int  nt_console_write (void * vbuffer, size_t nsize);
-extern BOOL nt_pathname_as_filename (char * name, char * buffer);
+extern BOOL nt_pathname_as_filename (const char * name, char * buffer);
 
 #endif /* SCM_NTSYS_H */
diff --git a/v7/src/microcode/utils.c b/v7/src/microcode/utils.c
index 29c3dd3fb..709774b54 100644
--- a/v7/src/microcode/utils.c
+++ b/v7/src/microcode/utils.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: utils.c,v 9.71 1997/01/02 05:21:41 cph Exp $
+$Id: utils.c,v 9.72 1997/06/26 06:58:07 cph Exp $
 
 Copyright (c) 1987-97 Massachusetts Institute of Technology
 
@@ -161,8 +161,10 @@ DEFUN (Setup_Interrupt, (masked_interrupts), long masked_interrupts)
   Global_Interrupt_Hook ();
   interrupt_handler = (VECTOR_REF (interrupt_handlers, interrupt_number));
 
+#if 0
   /* This label may be used in Global_Interrupt_Hook: */
  passed_checks:
+#endif
   Stop_History ();
   preserve_interrupt_mask ();
  Will_Push (STACK_ENV_EXTRA_SLOTS + 3);
-- 
2.25.1