--- ray/src/ot/oconv.c	2003/03/12 17:26:58	2.14
+++ ray/src/ot/oconv.c	2003/10/22 02:06:34	2.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: oconv.c,v 2.14 2003/03/12 17:26:58 greg Exp $";
+static const char RCSid[] = "$Id: oconv.c,v 2.18 2003/10/22 02:06:34 greg Exp $";
 #endif
 /*
  *  oconv.c - main program for object to octree conversion.
@@ -7,14 +7,11 @@ static const char RCSid[] = "$Id: oconv.c,v 2.14 2003/
  *     7/29/85
  */
 
+#include  "platform.h"
 #include  "standard.h"
-
 #include  "octree.h"
-
 #include  "object.h"
-
 #include  "otypes.h"
-
 #include  "paths.h"
 
 #define	 OMARGIN	(10*FTINY)	/* margin around global cube */
@@ -85,9 +82,7 @@ char  *argv[];
 			break;
 		}
 breakopt:
-#ifdef MSDOS
-	setmode(fileno(stdout), O_BINARY);
-#endif
+	SET_FILE_BINARY(stdout);
 	if (infile != NULL) {		/* get old octree & objects */
 		if (thescene.cusize > FTINY)
 			error(USER, "only one of '-b' or '-i'");
@@ -196,6 +191,11 @@ register char  *s;
 		inln = 0;
 }
 
+				/* conflicting def's in param.h */
+#undef  tstbit
+#undef  setbit
+#undef  clrbit
+#undef  tglbit
 
 #define	 bitop(f,i,op)		(f[((i)>>3)] op (1<<((i)&7)))
 #define	 tstbit(f,i)		bitop(f,i,&)