Fix version number.

diff --git a/v7/src/microcode/ntsys.c b/v7/src/microcode/ntsys.c
index e44527e2fbdf79e612702f7251d2f43f2d30030b..a5c3ad1a6c08cd5d5da5394e716fed6ef16fe58e 100644 (file)
--- a/v7/src/microcode/ntsys.c
+++ b/v7/src/microcode/ntsys.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntsys.c,v 1.3 1993/08/21 03:46:27 gjr Exp $
+$Id: ntsys.c,v 1.4 1993/09/03 18:03:03 gjr Exp $
 
 Copyright (c) 1992-1993 Massachusetts Institute of Technology
 
@@ -53,11 +53,10 @@ nt_get_version (version_t * version_number)
 {
   DWORD ver;
   ver = (GetVersion ());
-  version_number->major = (HIBYTE (HIWORD (ver)));
-  version_number->minor = (LOBYTE (HIWORD (ver)));
-  /* windows version major = (LOBYTE (LOWORD (ver)));
-     windows version minor = (HIBYTE (LOWORD (ver)));
-   */
+  version_number->platform = ((unsigned char)
+                             ((((unsigned long) ver) & 0x80000000UL) >> 31));
+  version_number->major = (LOBYTE (LOWORD (ver)));
+  version_number->minor = (HIBYTE (LOWORD (ver)));
   return;
 }
 

diff --git a/v7/src/microcode/ntsys.h b/v7/src/microcode/ntsys.h
index 4f6b2b28164a10b0d476684ef5aab9baf60674f2..3e534b6978ad9aba97f49f3af908968099fff1c9 100644 (file)
--- a/v7/src/microcode/ntsys.h
+++ b/v7/src/microcode/ntsys.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntsys.h,v 1.3 1993/08/21 03:47:20 gjr Exp $
+$Id: ntsys.h,v 1.4 1993/09/03 18:03:31 gjr Exp $
 
 Copyright (c) 1992-1993 Massachusetts Institute of Technology
 
@@ -37,6 +37,7 @@ MIT in each case. */
 \f
 typedef struct version_struct
 {
+  unsigned char platform;
   unsigned char major;
   unsigned char minor;
 } version_t;

diff --git a/v7/src/microcode/nttop.c b/v7/src/microcode/nttop.c
index f6a56e1ace59a4c626f5f6acb9fe0f84f7ba4ee7..e7e1e9f2ae5070bd8509374fea6ccff7af599980 100644 (file)
--- a/v7/src/microcode/nttop.c
+++ b/v7/src/microcode/nttop.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: nttop.c,v 1.8 1993/09/01 18:45:02 gjr Exp $
+$Id: nttop.c,v 1.9 1993/09/03 18:04:32 gjr Exp $
 
 Copyright (c) 1993 Massachusetts Institute of Technology
 
@@ -36,7 +36,6 @@ MIT in each case. */
 #include "ntgui.h"
 #include "nttop.h"
 #include "osctty.h"
-#include "ntutil.h"
 #include "prims.h"
 #include "errors.h"
 #include "option.h"
@@ -90,6 +89,10 @@ DEFUN_VOID (OS_initialize)
     version_t version_number;
 
     nt_get_version (&version_number);
+    OS_Variant = ((version_number.platform == 0)
+                 ? "Windows-NT"
+                 : "MS Windows");
+
     outf_console ("MIT Scheme running under %s %d.%d 386/486\n",
                  OS_Variant,
                  ((int) version_number.major),