Fix compilation errors with latest w32 API headers

* src/w32common.h: Rename OS_* to OS_SUBTYPE__*, as w32 API
headers started defining OS_NT, which breaks the use of the
enumeration.  All users changed.  (Bug#48303)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/w32proc.c b/src/w32proc.c
index b436eaff2c3..1233ea7e54a 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -623,7 +623,7 @@ init_timers (void)
      need to probe for its availability dynamically, and call it
      through a pointer.  */
   s_pfn_Get_Thread_Times = NULL; /* in case dumped Emacs comes with a value */
-  if (os_subtype != OS_9X)
+  if (os_subtype != OS_SUBTYPE_9X)
     s_pfn_Get_Thread_Times = (GetThreadTimes_Proc)
       get_proc_addr (GetModuleHandle ("kernel32.dll"), "GetThreadTimes");
 
@@ -2653,7 +2653,7 @@ find_child_console (HWND hwnd, LPARAM arg)
 
       GetClassName (hwnd, window_class, sizeof (window_class));
       if (strcmp (window_class,
-                  (os_subtype == OS_9X)
+                  (os_subtype == OS_SUBTYPE_9X)
                   ? "tty"
                   : "ConsoleWindowClass") == 0)
         {
@@ -2877,7 +2877,7 @@ sys_kill (pid_t pid, int sig)
       if (NILP (Vw32_start_process_share_console) && cp && cp->hwnd)
         {
 #if 1
-          if (os_subtype == OS_9X)
+          if (os_subtype == OS_SUBTYPE_9X)
             {
 /*
    Another possibility is to try terminating the VDM out-right by
@@ -3792,7 +3792,7 @@ w32_compare_strings (const char *s1, const char *s2, char *locname,
 
   if (!g_b_init_compare_string_w)
     {
-      if (os_subtype == OS_9X)
+      if (os_subtype == OS_SUBTYPE_9X)
         {
           pCompareStringW = (CompareStringW_Proc)
             get_proc_addr (LoadLibrary ("Unicows.dll"),