From 417a7a0e4da19593aaea8dbe665c031c6789f205 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 29 Jul 2012 19:22:27 +0300 Subject: [PATCH] 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 | 8 ++++++++ src/w32.c | 2 +- src/w32heap.c | 4 ++-- src/w32heap.h | 2 +- src/w32proc.c | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index fa1877f91c2..aba9846f6a6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2012-07-29 Eli Zaretskii + + * 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 * alloc.c (Fgarbage_collect): Indent as per usual Emacs style. diff --git a/src/w32.c b/src/w32.c index cd1d927e6fc..a9f4f6fb50e 100644 --- a/src/w32.c +++ b/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; diff --git a/src/w32heap.c b/src/w32heap.c index e34021b1099..26cc9aa0a0f 100644 --- a/src/w32heap.c +++ b/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; } diff --git a/src/w32heap.h b/src/w32heap.h index 7a20ba2a8b6..fda3c58bf01 100644 --- a/src/w32heap.h +++ b/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 }; diff --git a/src/w32proc.c b/src/w32proc.c index 15b0ea25bc7..cfc82fa2c47 100644 --- a/src/w32proc.c +++ b/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 -- 2.11.4.GIT