projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XEmacs 21.2.28 "Hermes".
[chise/xemacs-chise.git.1]
/
src
/
ntproc.c
diff --git
a/src/ntproc.c
b/src/ntproc.c
index
1546a74
..
029ba1f
100644
(file)
--- a/
src/ntproc.c
+++ b/
src/ntproc.c
@@
-32,7
+32,7
@@
Boston, MA 02111-1307, USA.
#include <signal.h>
/* must include CRT headers *before* config.h */
#include <signal.h>
/* must include CRT headers *before* config.h */
-/* ### I don't believe it - martin */
+/* #### I don't believe it - martin */
#include <config.h>
#undef signal
#undef wait
#include <config.h>
#undef signal
#undef wait
@@
-120,6
+120,13
@@
child_process *dead_child = NULL;
DWORD WINAPI reader_thread (void *arg);
DWORD WINAPI reader_thread (void *arg);
+/* Determine if running on Windows 9x and not NT */
+static int
+windows9x_p (void)
+{
+ return GetVersion () & 0x80000000;
+}
+
/* Find an unused process slot. */
child_process *
new_child (void)
/* Find an unused process slot. */
child_process *
new_child (void)
@@
-668,7
+675,9
@@
sys_spawnve (int mode, CONST char *cmdname,
errno = EINVAL;
return -1;
}
errno = EINVAL;
return -1;
}
- GET_C_STRING_FILENAME_DATA_ALLOCA (full, cmdname);
+ TO_EXTERNAL_FORMAT (LISP_STRING, full,
+ C_STRING_ALLOCA, cmdname,
+ Qfile_name);
}
else
{
}
else
{
@@
-937,7
+946,7
@@
find_child_console (HWND hwnd, child_process * cp)
GetClassName (hwnd, window_class, sizeof (window_class));
if (strcmp (window_class,
GetClassName (hwnd, window_class, sizeof (window_class));
if (strcmp (window_class,
- (os_subtype == OS_WIN95)
+ windows9x_p()
? "tty"
: "ConsoleWindowClass") == 0)
{
? "tty"
: "ConsoleWindowClass") == 0)
{
@@
-1030,7
+1039,7
@@
sys_kill (int pid, int sig)
if (NILP (Vwin32_start_process_share_console) && cp && cp->hwnd)
{
#if 1
if (NILP (Vwin32_start_process_share_console) && cp && cp->hwnd)
{
#if 1
- if (os_subtype == OS_WIN95)
+ if (windows9x_p())
{
/*
Another possibility is to try terminating the VDM out-right by
{
/*
Another possibility is to try terminating the VDM out-right by
@@
-1419,7
+1428,7
@@
If successful, the new locale id is returned, otherwise nil.
/* Sync with FSF Emacs 19.34.6 note: dwWinThreadId declared in
w32term.h and defined in w32fns.c, both of which are not in current
/* Sync with FSF Emacs 19.34.6 note: dwWinThreadId declared in
w32term.h and defined in w32fns.c, both of which are not in current
- XEmacs. ### Check what we lose by ifdef'ing out these. --marcpa */
+ XEmacs. #### Check what we lose by ifdef'ing out these. --marcpa */
#if 0
/* Need to set input thread locale if present. */
if (dwWinThreadId)
#if 0
/* Need to set input thread locale if present. */
if (dwWinThreadId)