--- ray/src/rt/rv2.c	2003/02/25 02:47:23	2.39
+++ ray/src/rt/rv2.c	2003/06/30 14:59:13	2.41
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rv2.c,v 2.39 2003/02/25 02:47:23 greg Exp $";
+static const char	RCSid[] = "$Id: rv2.c,v 2.41 2003/06/30 14:59:13 schorsch Exp $";
 #endif
 /*
  *  rv2.c - command routines used in tracing a view.
@@ -9,14 +9,14 @@ static const char	RCSid[] = "$Id: rv2.c,v 2.39 2003/02
 
 #include "copyright.h"
 
-#include  "ray.h"
+#include  <ctype.h>
+#include  <string.h>
 
+#include  "platform.h"
+#include  "ray.h"
 #include  "otypes.h"
-
 #include  "rpaint.h"
 
-#include  <ctype.h>
-
 extern int  psample;			/* pixel sample size */
 extern double  maxdiff;			/* max. sample difference */
 
@@ -464,10 +464,10 @@ void  *p;
 			(*dev->comout)(buf);
 			(*dev->comin)(buf, NULL);
 			if (buf[0] == '\0' ||
-					index("yY+1tTnN-0fF", buf[0]) == NULL)
+					strchr("yY+1tTnN-0fF", buf[0]) == NULL)
 				return(0);
 		}
-		ptr->i = index("yY+1tT", buf[0]) != NULL;
+		ptr->i = strchr("yY+1tT", buf[0]) != NULL;
 		return(1);
 	case 'C':			/* color */
 		if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) {
@@ -754,9 +754,7 @@ char  *s;
 		error(COMMAND, errmsg);
 		return;
 	}
-#ifdef MSDOS
-	setmode(fileno(fp), O_BINARY);
-#endif
+	SET_FILE_BINARY(fp);
 	(*dev->comout)("writing \"");
 	(*dev->comout)(fname);
 	(*dev->comout)("\"...\n");