Rename OS_WINDOWS_95 to OS_9X.

 src/w32heap.h (OS_9X): Renamed from OS_WINDOWS_95.
 src/w32heap.c (cache_system_info):
 src/w32.c (sys_rename):
 src/w32proc.c (find_child_console, sys_kill): All users changed.

src/ChangeLog

+2012-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32heap.h (OS_9X): Renamed from OS_WINDOWS_95.
+
+	* w32heap.c (cache_system_info):
+	* w32.c (sys_rename):
+	* w32proc.c (find_child_console, sys_kill): All users changed.
+
 2012-07-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* alloc.c (Fgarbage_collect): Indent as per usual Emacs style.

src/w32.c

@@ -2929,7 +2929,7 @@ sys_rename (const char * oldname, const char * newname)
   /* volume_info is set indirectly by map_w32_filename.  */
   oldname_dev = volume_info.serialnum;
 
-  if (os_subtype == OS_WINDOWS_95)
+  if (os_subtype == OS_9X)
     {
       char * o;
       char * p;

src/w32heap.c

@@ -66,7 +66,7 @@ cache_system_info (void)
   w32_minor_version = version.info.minor;
 
   if (version.info.platform & 0x8000)
-    os_subtype = OS_WINDOWS_95;
+    os_subtype = OS_9X;
   else
     os_subtype = OS_NT;
 
@@ -79,7 +79,7 @@ cache_system_info (void)
   GetVersionEx (&osinfo_cache);
 
   w32_build_number = osinfo_cache.dwBuildNumber;
-  if (os_subtype == OS_WINDOWS_95)
+  if (os_subtype == OS_9X)
     w32_build_number &= 0xffff;
 }
 

src/w32heap.h

@@ -51,7 +51,7 @@ extern int    	      w32_minor_version;
 extern int    	      w32_build_number;
 
 enum {
-  OS_WINDOWS_95 = 1,
+  OS_9X = 1,
   OS_NT
 };
 

src/w32proc.c

@@ -1386,7 +1386,7 @@ find_child_console (HWND hwnd, LPARAM arg)
 
       GetClassName (hwnd, window_class, sizeof (window_class));
       if (strcmp (window_class,
-		  (os_subtype == OS_WINDOWS_95)
+		  (os_subtype == OS_9X)
 		  ? "tty"
 		  : "ConsoleWindowClass") == 0)
 	{
@@ -1517,7 +1517,7 @@ sys_kill (int pid, int sig)
       if (NILP (Vw32_start_process_share_console) && cp && cp->hwnd)
 	{
 #if 1
-	  if (os_subtype == OS_WINDOWS_95)
+	  if (os_subtype == OS_9X)
 	    {
 /*
    Another possibility is to try terminating the VDM out-right by