--- ray/src/ot/sphere.c 1991/10/23 13:43:34 1.4 +++ ray/src/ot/sphere.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: sphere.c,v 2.4 2004/03/27 12:41:45 schorsch Exp $"; #endif - /* * sphere.c - routines for creating octrees for spheres. * @@ -53,13 +50,16 @@ static char SCCSid[] = "$SunId$ LBL"; */ -o_sphere(o, cu) /* determine if sphere intersects cube */ -OBJREC *o; -register CUBE *cu; +/* XXX o_sphere() is extern, but not declared in any header file */ +int +o_sphere( /* determine if sphere intersects cube */ + OBJREC *o, + register CUBE *cu +) { FVECT v1; double d1, d2; - register FLOAT *fa; + register RREAL *fa; register int i; #define cent fa #define rad fa[3]