procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename OS_WINDOWS_95 to OS_9X.

Browse source 
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.
This commit is contained in:
Eli Zaretskii 2012-07-29 19:22:27 +03:00
parent 387d4d92bc
commit 417a7a0e4d
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
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.

2
src/w32.c
View file

@ -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;

4
src/w32heap.c
View file

@ -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;
}

2
src/w32heap.h
View file

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

4
src/w32proc.c
View file

@ -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