--- a/src/ntproc.c	Mon Aug 13 11:15:00 2007 +0200
+++ b/src/ntproc.c	Mon Aug 13 11:16:07 2007 +0200
@@ -55,6 +55,9 @@
 #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. */
@@ -120,13 +123,6 @@
 
 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)
@@ -751,7 +747,7 @@
       /* 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 ? '"' : '\\';
     }
@@ -947,7 +943,7 @@
 
       GetClassName (hwnd, window_class, sizeof (window_class));
       if (strcmp (window_class,
-		  windows9x_p()
+		  msw_windows9x_p()
 		  ? "tty"
 		  : "ConsoleWindowClass") == 0)
 	{
@@ -1040,7 +1036,7 @@
       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
@@ -1442,7 +1438,7 @@
 
 
 void
-syms_of_ntproc ()
+syms_of_ntproc (void)
 {
   DEFSUBR (Fwin32_short_file_name);
   DEFSUBR (Fwin32_long_file_name);