--- ray/src/common/platform.h	2003/06/30 19:58:37	3.6
+++ ray/src/common/platform.h	2003/10/27 10:19:31	3.11
@@ -1,19 +1,21 @@
-/* RCSid $Id: platform.h,v 3.6 2003/06/30 19:58:37 schorsch Exp $ */
+/* RCSid $Id: platform.h,v 3.11 2003/10/27 10:19:31 schorsch Exp $ */
 /*
  *  platform.h - header file for platform specific definitions
  */
 #ifndef _RAD_PLATFORM_H_
 #define _RAD_PLATFORM_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #ifdef _WIN32
 
+  #include <io.h>     /* _setmode() and stuff from unistd.h */
+  typedef long off_t;
+
   #include <stdio.h>
-  #define popen _popen
-  #define pclose _pclose
+  #define snprintf _snprintf
 
+  #include <windows.h>
+  #define sleep(s) Sleep(s*1000)
+
   #define NON_POSIX
 
   #include <sys/types.h>
@@ -23,7 +25,6 @@ extern "C" {
   #define W_IFDIR _S_IFDIR
 
   #include <fcntl.h>  /* _O_BINARY, _O_TEXT */
-  #include <io.h>     /* _setmode() */
   #include <stdlib.h> /* _fmode */
   #define SET_DEFAULT_BINARY() _fmode = _O_BINARY
   #define SET_FILE_BINARY(fp) _setmode(fileno(fp),_O_BINARY)
@@ -35,7 +36,7 @@ extern "C" {
     #define NON_POSIX
   #else
     /* assumedly posix systems */
-    #define RHAS_GETPWNAM
+	#include <unistd.h>
     #define RHAS_STAT
     #define RHAS_FORK_EXEC
   #endif
@@ -49,6 +50,11 @@ extern "C" {
 
 #endif /* _WIN32 */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* nothing to protect yet */
 
 #ifdef __cplusplus
 }