XEmacs 21.2.32 "Kastor & Polydeukes".

[chise/xemacs-chise.git.1] / src / ntproc.c

diff --git a/src/ntproc.c b/src/ntproc.c
index 0b95e43..eed038e 100644 (file)
--- a/src/ntproc.c
+++ b/src/ntproc.c
@@ -55,6 +55,9 @@ Boston, MA 02111-1307, USA.
 #include "syswait.h"
 #include "buffer.h"
 #include "process.h"
 #include "syswait.h"
 #include "buffer.h"
 #include "process.h"

+
+#include "console-msw.h"
+

 /*#include "w32term.h"*/ /* From 19.34.6: sync in ? --marcpa */
 
 /* #### I'm not going to play with shit. */
 /*#include "w32term.h"*/ /* From 19.34.6: sync in ? --marcpa */
 
 /* #### I'm not going to play with shit. */

@@ -120,13 +123,6 @@ 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)

@@ -751,7 +747,7 @@ sys_spawnve (int mode, const char *cmdname,
       /* Override escape char by binding win32-quote-process-args to
         desired character, or use t for auto-selection.  */
       if (INTP (Vwin32_quote_process_args))
       /* Override escape char by binding win32-quote-process-args to
         desired character, or use t for auto-selection.  */
       if (INTP (Vwin32_quote_process_args))

-       escape_char = XINT (Vwin32_quote_process_args);
+       escape_char = (char) XINT (Vwin32_quote_process_args);

       else
        escape_char = is_cygnus_app ? '"' : '\\';
     }
       else
        escape_char = is_cygnus_app ? '"' : '\\';
     }

@@ -947,7 +943,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,

-                 windows9x_p()
+                 msw_windows9x_p()

                  ? "tty"
                  : "ConsoleWindowClass") == 0)
        {
                  ? "tty"
                  : "ConsoleWindowClass") == 0)
        {

@@ -1040,7 +1036,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 (windows9x_p())
+         if (msw_windows9x_p())

            {
 /*
    Another possibility is to try terminating the VDM out-right by
            {
 /*
    Another possibility is to try terminating the VDM out-right by

@@ -1442,7 +1438,7 @@ If successful, the new locale id is returned, otherwise nil.
 
 \f
 void
 
 \f
 void

-syms_of_ntproc ()
+syms_of_ntproc (void)

 {
   DEFSUBR (Fwin32_short_file_name);
   DEFSUBR (Fwin32_long_file_name);
 {
   DEFSUBR (Fwin32_short_file_name);
   DEFSUBR (Fwin32_long_file_name);