--- ray/src/ot/o_face.c	1991/11/12 17:00:53	2.1
+++ ray/src/ot/o_face.c	2004/03/27 12:41:45	2.4
@@ -1,9 +1,6 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: o_face.c,v 2.4 2004/03/27 12:41:45 schorsch Exp $";
 #endif
-
 /*
  *  o_face.c - routines for creating octrees for polygonal faces.
  *
@@ -40,10 +37,12 @@ static char SCCSid[] = "$SunId$ LBL";
  *	5) If test 4 fails, we have no intersection.
  */
 
-
-o_face(o, cu)			/* determine if face intersects cube */
-OBJREC  *o;
-CUBE  *cu;
+/* XXX this is extern, but not declared in any header file yet */
+int
+o_face(			/* determine if face intersects cube */
+	OBJREC  *o,
+	CUBE  *cu
+)
 {
 	FVECT  cumin, cumax;
 	FVECT  v1, v2;
@@ -62,7 +61,7 @@ CUBE  *cu;
 
 	vloc = ABOVE | BELOW;		/* check vertices */
 	for (i = 0; i < f->nv; i++)
-		if (j = plocate(VERTEX(f,i), cumin, cumax))
+		if ( (j = plocate(VERTEX(f,i), cumin, cumax)) )
 			vloc &= j;
 		else
 			return(O_HIT);	/* vertex inside */