--- ray/src/common/platform.h	2003/07/03 22:41:44	3.7
+++ ray/src/common/platform.h	2003/10/27 10:19:31	3.11
@@ -1,12 +1,9 @@
-/* RCSid $Id: platform.h,v 3.7 2003/07/03 22:41:44 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
 
@@ -14,8 +11,7 @@ extern "C" {
   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)
@@ -40,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
@@ -54,6 +50,11 @@ extern "C" {
 
 #endif /* _WIN32 */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* nothing to protect yet */
 
 #ifdef __cplusplus
 }