[Emacs-diffs] /srv/bzr/emacs/trunk r109265: Rename OS_WINDOWS_95 to OS_9X.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109265
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2012-07-29 19:22:27 +0300
message:
  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.
modified:
  src/ChangeLog
  src/w32.c
  src/w32heap.c
  src/w32heap.h
  src/w32proc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-29 16:00:35 +0000
+++ b/src/ChangeLog     2012-07-29 16:22:27 +0000
@@ -1,3 +1,11 @@
+2012-07-29  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * alloc.c (Fgarbage_collect): Indent as per usual Emacs style.

=== modified file 'src/w32.c'
--- a/src/w32.c 2012-07-29 08:18:29 +0000
+++ b/src/w32.c 2012-07-29 16:22:27 +0000
@@ -2929,7 +2929,7 @@
   /* 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;

=== modified file 'src/w32heap.c'
--- a/src/w32heap.c     2012-07-29 08:18:29 +0000
+++ b/src/w32heap.c     2012-07-29 16:22:27 +0000
@@ -66,7 +66,7 @@
   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 @@
   GetVersionEx (&osinfo_cache);
 
   w32_build_number = osinfo_cache.dwBuildNumber;
-  if (os_subtype == OS_WINDOWS_95)
+  if (os_subtype == OS_9X)
     w32_build_number &= 0xffff;
 }
 

=== modified file 'src/w32heap.h'
--- a/src/w32heap.h     2012-07-29 08:18:29 +0000
+++ b/src/w32heap.h     2012-07-29 16:22:27 +0000
@@ -51,7 +51,7 @@
 extern int           w32_build_number;
 
 enum {
-  OS_WINDOWS_95 = 1,
+  OS_9X = 1,
   OS_NT
 };
 

=== modified file 'src/w32proc.c'
--- a/src/w32proc.c     2012-07-29 08:18:29 +0000
+++ b/src/w32proc.c     2012-07-29 16:22:27 +0000
@@ -1386,7 +1386,7 @@
 
       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 @@
       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