--- ray/src/common/platform.h	2003/06/30 19:58:37	3.6
+++ ray/src/common/platform.h	2016/08/05 00:12:46	3.13
@@ -1,19 +1,52 @@
-/* RCSid $Id: platform.h,v 3.6 2003/06/30 19:58:37 schorsch Exp $ */
+/* RCSid $Id: platform.h,v 3.13 2016/08/05 00:12:46 greg Exp $ */
 /*
  *  platform.h - header file for platform specific definitions
  */
 #ifndef _RAD_PLATFORM_H_
 #define _RAD_PLATFORM_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
 
+  #include <io.h>     /* _setmode() and stuff from unistd.h */
   #include <stdio.h>
-  #define popen _popen
-  #define pclose _pclose
+  typedef long off_t;
+  #define fdopen _fdopen
+  #define read _read
+  #define open _open
+  #define close _close
+  #define write _write
+  #define ftruncate _chsize_s
+  #define unlink _unlink
+  #define fileno _fileno
+  #define snprintf _snprintf
+  #define vsnprintf _vsnprintf
+  /* XXX should we check first if size_t is 32 bit? */
+  #define fseeko _fseeki64
+  #define lseek _lseek
+  #define access _access
+  #define mktemp _mktemp
 
+  #include <string.h>
+  #define strcasecmp _stricmp
+  #define strncasecmp _strnicmp
+  #define strdup _strdup
+
+  #include <windows.h>
+  /* really weird defines by Microsoft in <resource.h>
+	 generating lots of name collisions in Radiance. */
+  #if defined(rad1)
+    #undef rad1
+    #undef rad2
+    #undef rad3
+    #undef rad4
+    #undef rad5
+    #undef rad6
+    #undef rad7
+    #undef rad8
+    #undef rad9
+  #endif
+  #define sleep(s) Sleep((DWORD)((s)*1000))
+
   #define NON_POSIX
 
   #include <sys/types.h>
@@ -23,19 +56,19 @@ 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)
+  #define SET_FILE_BINARY(fp) _setmode(_fileno(fp),_O_BINARY)
   #define SET_FD_BINARY(fd) _setmode(fd,_O_BINARY)
+  #define putenv _putenv
 
-#else /* _WIN32 */
+#else /* _WIN32 || _WIN64 */
 
   #ifdef AMIGA
     #define NON_POSIX
   #else
     /* assumedly posix systems */
-    #define RHAS_GETPWNAM
+	#include <unistd.h>
     #define RHAS_STAT
     #define RHAS_FORK_EXEC
   #endif
@@ -47,8 +80,13 @@ extern "C" {
   #define SET_FILE_BINARY(fp)
   #define SET_FD_BINARY(fd)
 
-#endif /* _WIN32 */
+#endif /* _WIN32 || _WIN64 */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* nothing to protect yet */
 
 #ifdef __cplusplus
 }