--- a/src/process.h	Mon Aug 13 11:33:40 2007 +0200
+++ b/src/process.h	Mon Aug 13 11:35:02 2007 +0200
@@ -37,7 +37,8 @@
 
 #else /* not NO_SUBPROCESSES */
 
-/* Only process.c needs to know about the guts of this */
+/* struct Lisp_Process is defined in procimpl.h; only process-*.c need
+   to know about the guts of it. */
 
 DECLARE_LRECORD (process, Lisp_Process);
 #define XPROCESS(x) XRECORD (x, process, Lisp_Process)
@@ -73,7 +74,7 @@
 extern volatile int synch_process_alive;
 
 /* Nonzero => this is a string explaining death of synchronous subprocess.  */
-extern CONST char *synch_process_death;
+extern const char *synch_process_death;
 
 /* If synch_process_death is zero,
    this is exit code of synchronous subprocess.  */
@@ -108,17 +109,17 @@
 
 void deactivate_process (Lisp_Object proc);
 
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 int
 #else
 void
 #endif
 child_setup (int in, int out, int err,
-		  char **new_argv, CONST char *current_dir);
+		  char **new_argv, const char *current_dir);
 
 Charcount read_process_output (Lisp_Object proc);
 
-CONST char *signal_name (int signum);
+const char *signal_name (int signum);
 
 Lisp_Object canonicalize_host_name (Lisp_Object host);
 
@@ -138,13 +139,4 @@
 
 #endif /* emacs */
 
-#ifdef HAVE_GETPT
-#define PTY_ITERATION
-#define PTY_OPEN \
-    if ((fd = getpt()) < 0 || grantpt (fd) < 0 || unlockpt (fd) < 0) \
-      return -1;
-#define PTY_NAME_SPRINTF
-#define PTY_TTY_NAME_SPRINTF strcpy (pty_name, ptsname (fd));
-#endif
-
 #endif /* INCLUDED_process_h_ */