--- ray/src/ot/o_cone.c	1991/11/12 17:00:48	2.1
+++ ray/src/ot/o_cone.c	2004/03/27 12:41:45	2.3
@@ -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_cone.c,v 2.3 2004/03/27 12:41:45 schorsch Exp $";
 #endif
-
 /*
  *  o_cone.c - routines for intersecting cubes with cones.
  *
@@ -11,11 +8,8 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 #include  "standard.h"
-
 #include  "octree.h"
-
 #include  "object.h"
-
 #include  "cone.h"
 
 #define  ROOT3		1.732050808
@@ -35,19 +29,27 @@ static char SCCSid[] = "$SunId$ LBL";
 
 extern double  mincusize;		/* minimum cube size */
 
+static double findcseg(FVECT ep0, FVECT ep1, CONE *co, FVECT p);
 
-o_cone(o, cu)			/* determine if cone intersects cube */
-OBJREC  *o;
-register CUBE  *cu;
+
+
+/* XXX o_cone() is extern, but not declared in any header file */
+int
+o_cone(			/* determine if cone intersects cube */
+	OBJREC  *o,
+	register CUBE  *cu
+)
 {
-	double  dist2lseg(), findcseg();
 	CONE  *co;
 	FVECT  ep0, ep1;
+#ifdef STRICT
 	FVECT  cumin, cumax;
 	CUBE  cukid;
+	register int  j;
+#endif
 	double  r;
 	FVECT  p;
-	register int  i, j;
+	register int  i;
 					/* get cone arguments */
 	co = getcone(o, 0);
 					/* get cube center */
@@ -91,11 +93,13 @@ register CUBE  *cu;
 }
 
 
-double
-findcseg(ep0, ep1, co, p)	/* find line segment from cone closest to p */
-FVECT  ep0, ep1;
-register CONE  *co;
-FVECT  p;
+static double
+findcseg(	/* find line segment from cone closest to p */
+	FVECT  ep0,
+	FVECT  ep1,
+	register CONE  *co,
+	FVECT  p
+)
 {
 	double  d;
 	FVECT  v;