--- ray/src/ot/oconv.c	2003/06/05 19:29:34	2.15
+++ ray/src/ot/oconv.c	2003/06/21 15:05:01	2.17
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: oconv.c,v 2.15 2003/06/05 19:29:34 schorsch Exp $";
+static const char RCSid[] = "$Id: oconv.c,v 2.17 2003/06/21 15:05:01 greg Exp $";
 #endif
 /*
  *  oconv.c - main program for object to octree conversion.
@@ -8,13 +8,10 @@ static const char RCSid[] = "$Id: oconv.c,v 2.15 2003/
  */
 
 #include  "standard.h"
-
+#include  "platform.h"
 #include  "octree.h"
-
 #include  "object.h"
-
 #include  "otypes.h"
-
 #include  "paths.h"
 
 #define	 OMARGIN	(10*FTINY)	/* margin around global cube */
@@ -194,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,&)