From: Chris Hanson <org/chris-hanson/cph>
Date: Thu, 26 Jun 1997 07:05:11 +0000 (+0000)
Subject: Don't use the external Scheme DLL any more.  This is important for the
X-Git-Tag: 20090517-FFI~5095
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=6f679065a7fa1d8ff8c4a273319838dc406703c5;p=mit-scheme.git

Don't use the external Scheme DLL any more.  This is important for the
moment as I have not yet figured out how to make working DLLs with the
new Watcom compiler.  However, the Scheme DLL probably doesn't matter
any more as we no longer care about Windows 3.1.
---

diff --git a/v7/src/microcode/nttop.c b/v7/src/microcode/nttop.c
index a7f22cb4e..56c7aaf51 100644
--- a/v7/src/microcode/nttop.c
+++ b/v7/src/microcode/nttop.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: nttop.c,v 1.20 1997/04/02 07:43:51 cph Exp $
+$Id: nttop.c,v 1.21 1997/06/26 07:05:11 cph Exp $
 
 Copyright (c) 1993-97 Massachusetts Institute of Technology
 
@@ -82,6 +82,7 @@ HINSTANCE win32_system_utilities_dll = 0;
 void
 NT_initialize_win32_system_utilities ()
 {
+#ifdef USE_SCHEME_DLL
   char * dll_name = win32_under_win32s_p() ? "SCHEME31.DLL" : "SCHEME32.DLL";
   char * entry_name = "install_win32_system_utilities";
   FARPROC install;
@@ -106,6 +107,11 @@ NT_initialize_win32_system_utilities ()
   }
 
   install (&win32_system_utilities);
+#else
+  extern void FAR WINAPI install_win32_system_utilities
+    (WIN32_SYSTEM_UTILITIES *);
+  install_win32_system_utilities (&win32_system_utilities);
+#endif
 }
 
 static int interactive;
@@ -156,7 +162,7 @@ DEFUN_VOID (OS_initialize)
     }
 
     OS_Variant = malloc (128);
-    sprintf (OS_Variant, "%s 386/486\n", variant);
+    sprintf (((char *) OS_Variant), "%s 386/486\n", variant);
   }
 }