NT changes:

- Abstract functionality not available in Win32s so it can be provided
in a DLL.

- Remove some fossil DOS code from ntsig.c.

- ntscreen.c can now emulate an ansi.sys terminal.

diff --git a/v7/src/microcode/ntenv.c b/v7/src/microcode/ntenv.c
index 0bbcbb338e51a46db96066e2f943927e447d472c..077871d3b459690b0f27381c11cb42b0771ef37d 100644 (file)
--- a/v7/src/microcode/ntenv.c
+++ b/v7/src/microcode/ntenv.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntenv.c,v 1.4 1993/07/18 20:26:08 gjr Exp $
+$Id: ntenv.c,v 1.5 1993/07/27 21:27:42 gjr Exp $
 
 Copyright (c) 1992-1993 Massachusetts Institute of Technology
 
@@ -119,17 +119,12 @@ DEFUN (ms_to_ticks, (clocks), clock_t clocks)
   return (result == 0) ? 1 : result;
 }
 
-
-extern volatile unsigned long scm_itimer_counter, scm_itimer_reload;
-
 void
 DEFUN (OS_process_timer_set, (first, interval),
        clock_t first AND
        clock_t interval)
-{ /* Convert granularity to 1/18.2 seconds */
-
-  scm_itimer_counter = ms_to_ticks(first);
-  scm_itimer_reload  = ms_to_ticks(interval);
+{
+  /* Convert granularity to 1/18.2 seconds */
 
   return;
 }
@@ -137,7 +132,6 @@ DEFUN (OS_process_timer_set, (first, interval),
 void
 DEFUN_VOID (OS_process_timer_clear)
 {
-  scm_itimer_reload = scm_itimer_counter = 0;
   return;
 }
 

diff --git a/v7/src/microcode/nttrap.c b/v7/src/microcode/nttrap.c
index 44050be30e6af1f7d045970181be173200fb31a4..6401992861810166942ec777631fc9c30843d0cb 100644 (file)
--- a/v7/src/microcode/nttrap.c
+++ b/v7/src/microcode/nttrap.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: nttrap.c,v 1.3 1993/06/24 02:10:58 gjr Exp $
+$Id: nttrap.c,v 1.4 1993/07/27 21:27:06 gjr Exp $
 
 Copyright (c) 1992-1993 Massachusetts Institute of Technology
 
@@ -574,7 +574,6 @@ DEFUN (continue_from_trap, (trapno, info, scp),
        SIGINFO_T info AND
        struct FULL_SIGCONTEXT * scp)
 {
-  extern unsigned short scheme_ss;
   int pc_in_C;
   int pc_in_heap;
   int pc_in_constant_space;
@@ -631,9 +630,7 @@ DEFUN (continue_from_trap, (trapno, info, scp),
 
   scheme_sp_valid =
     (pc_in_scheme
-     && (((scp->sc_ss & 0xffff) == (scp->sc_ds & 0xffff))
-        || ((scheme_ss != 0)
-            && ((scp->sc_ss & 0xffff) == scheme_ss)))
+     && ((scp->sc_ss & 0xffff) == (scp->sc_ds & 0xffff))
      && ((scp->sc_ds & 0xffff) == (initial_C_ds & 0xffff))
      && ((scheme_sp < ((long) Stack_Top)) &&
         (scheme_sp >= ((long) Absolute_Stack_Base)) &&