--- ray/src/common/rtprocess.h	2003/06/27 06:53:21	3.2
+++ ray/src/common/rtprocess.h	2003/07/14 22:23:59	3.4
@@ -1,4 +1,4 @@
-/* RCSid $Id: rtprocess.h,v 3.2 2003/06/27 06:53:21 greg Exp $ */
+/* RCSid $Id: rtprocess.h,v 3.4 2003/07/14 22:23:59 schorsch Exp $ */
 /*
  *   rtprocess.h 
  *   Routines to communicate with separate process via dual pipes
@@ -7,23 +7,21 @@
  */
 #ifndef _RAD_PROCESS_H_
 #define _RAD_PROCESS_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-#include  <sys/types.h>
+#include  <errno.h>
 #ifdef _WIN32
-  #include <windows.h>
+  #include <windows.h> /* DWORD etc. */
+  typedef DWORD pid_t;
+  #include <process.h> /* getpid() and others */
 #else
   #include <sys/param.h>
-  #include <unistd.h>
 #endif
-#ifndef BSD
-#include  <errno.h>
-#endif
 
 #include "paths.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* On Windows, a process ID is a DWORD. That might actually be the
    same thing as an int, but it's better not to assume anything.
@@ -38,9 +36,6 @@ extern "C" {
    runtime, so that client modules can still use -1 as invalid PID.
 */
 
-#ifdef _WIN32
-  typedef DWORD pid_t;
-#endif
 
 #ifndef PIPE_BUF
   #ifdef PIPSIZ