Changes to allow Win32 microcode to be compiled by the Watcom C

compiler.

diff --git a/v7/src/microcode/ntutl/ntgui.rc b/v7/src/microcode/ntutl/ntgui.rc
index 6d33fcf8201f1b173f90263cca84ec0084fb2ca3..0f00af7731d447f7f8df9ce61cd5dd77ecb53251 100644 (file)
--- a/v7/src/microcode/ntutl/ntgui.rc
+++ b/v7/src/microcode/ntutl/ntgui.rc
@@ -52,6 +52,8 @@ BEGIN
   END
 END
 
+#ifdef __WATCOMC__
+#include "ntdialog.dlg"
+#else
 RCINCLUDE NTDIALOG.DLG
-
-
+#endif

diff --git a/v7/src/microcode/ntutl/scheme31.c b/v7/src/microcode/ntutl/scheme31.c
index 4417a4b44811cab361f7ffd95c1e5528cac9909b..bc5092b5b907d829e21600109ff6ca05c60ad86a 100644 (file)
--- a/v7/src/microcode/ntutl/scheme31.c
+++ b/v7/src/microcode/ntutl/scheme31.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: scheme31.c,v 1.5 1993/09/13 18:41:24 gjr Exp $
+$Id: scheme31.c,v 1.6 1995/10/24 05:34:23 cph Exp $
 
-Copyright (c) 1993 Massachusetts Institute of Technology
+Copyright (c) 1993-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -41,6 +41,8 @@ MIT in each case. */
 
 /* Utilities */
 
+#ifdef CL386
+
 unsigned short
 getCS (void)
 {
@@ -58,6 +60,21 @@ getSS (void)
 {
   _asm mov     ax,ss
 }
+
+#else /* not CL386 */
+#ifdef __WATCOMC__
+
+extern unsigned short getCS (void);
+#pragma aux getCS = "mov ax,cs" value [ax];
+
+extern unsigned short getDS (void);
+#pragma aux getDS = "mov ax,ds" value [ax];
+
+extern unsigned short getSS (void);
+#pragma aux getSS = "mov ax,ss" value [ax];
+
+#endif /* __WATCOMC__ */
+#endif /* not CL386 */
 \f
 static UT32PROC call_16_bit_code = NULL;
 

diff --git a/v7/src/microcode/ntutl/scheme32.c b/v7/src/microcode/ntutl/scheme32.c
index 3111e1e7560f3cb90d051531c406d20b55d354d0..059d07d5c996d387479c8c6c9fbce730e48ac757 100644 (file)
--- a/v7/src/microcode/ntutl/scheme32.c
+++ b/v7/src/microcode/ntutl/scheme32.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: scheme32.c,v 1.7 1993/09/13 18:40:22 gjr Exp $
+$Id: scheme32.c,v 1.8 1995/10/24 05:36:00 cph Exp $
 
-Copyright (c) 1993 Massachusetts Institute of Technology
+Copyright (c) 1993-95 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -48,8 +48,9 @@ win32_under_win32s_p (void)
 char *
 win32_allocate_heap (unsigned long size, unsigned long * handle)
 {
+#ifdef CL386
   extern char * malloc (unsigned long);
-
+#endif
   * handle = 0L;
   return ((char *) (malloc (size)));
 }
@@ -95,7 +96,15 @@ struct win32_timer_closure_s
   HWND window;
 };
 
-static void _stdcall
+#ifdef CL386
+#define __STDCALL _stdcall
+#endif
+
+#ifdef __WATCOMC__
+#define __STDCALL __stdcall
+#endif
+
+static void __STDCALL
 win32_nt_timer_tick (UINT wID, UINT wMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
 {
   struct win32_timer_closure_s * scm_timer =