--- ray/src/common/platform.h	2016/08/05 00:12:46	3.13
+++ ray/src/common/platform.h	2018/03/20 22:45:29	3.16
@@ -1,4 +1,4 @@
-/* RCSid $Id: platform.h,v 3.13 2016/08/05 00:12:46 greg Exp $ */
+/* RCSid $Id: platform.h,v 3.16 2018/03/20 22:45:29 greg Exp $ */
 /*
  *  platform.h - header file for platform specific definitions
  */
@@ -10,25 +10,42 @@
   #include <io.h>     /* _setmode() and stuff from unistd.h */
   #include <stdio.h>
   typedef long off_t;
+  #undef fdopen
   #define fdopen _fdopen
+  #undef read
   #define read _read
+  #undef open
   #define open _open
+  #undef close
   #define close _close
+  #undef write
   #define write _write
+  #undef ftruncate
   #define ftruncate _chsize_s
+  #undef unlink
   #define unlink _unlink
+  #undef fileno
   #define fileno _fileno
+  #undef snprintf
   #define snprintf _snprintf
+  #undef vsnprintf
   #define vsnprintf _vsnprintf
   /* XXX should we check first if size_t is 32 bit? */
+  #undef fseeko
   #define fseeko _fseeki64
+  #undef lseek
   #define lseek _lseek
+  #undef access
   #define access _access
+  #undef mktemp
   #define mktemp _mktemp
 
   #include <string.h>
+  #undef strcasecmp
   #define strcasecmp _stricmp
+  #undef strncasecmp
   #define strncasecmp _strnicmp
+  #undef strdup
   #define strdup _strdup
 
   #include <windows.h>
@@ -57,9 +74,12 @@
 
   #include <fcntl.h>  /* _O_BINARY, _O_TEXT */
   #include <stdlib.h> /* _fmode */
-  #define SET_DEFAULT_BINARY() _fmode = _O_BINARY
+  #define SET_DEFAULT_BINARY() (_fmode = _O_BINARY)
+  #define SET_DEFAULT_TEXT() (_fmode = _O_TEXT)
   #define SET_FILE_BINARY(fp) _setmode(_fileno(fp),_O_BINARY)
+  #define SET_FILE_TEXT(fp) _setmode(_fileno(fp),_O_TEXT)
   #define SET_FD_BINARY(fd) _setmode(fd,_O_BINARY)
+  #define SET_FD_TEXT(fd) _setmode(fd,_O_TEXT)
   #define putenv _putenv
 
 #else /* _WIN32 || _WIN64 */
@@ -79,6 +99,9 @@
   #define SET_DEFAULT_BINARY()
   #define SET_FILE_BINARY(fp)
   #define SET_FD_BINARY(fd)
+  #define SET_DEFAULT_TEXT()
+  #define SET_FILE_TEXT(fp)
+  #define SET_FD_TEXT(fd)
 
 #endif /* _WIN32 || _WIN64 */
 
@@ -86,7 +109,11 @@
 extern "C" {
 #endif
 
-/* nothing to protect yet */
+#if defined(_WIN32) || defined(_WIN64)
+
+extern	int	usleep(__int64 usec);
+
+#endif /* _WIN32 || _WIN64 */
 
 #ifdef __cplusplus
 }