--- ray/src/gen/genmarble.c	1993/08/02 14:23:03	2.4
+++ ray/src/gen/genmarble.c	2003/11/16 10:29:38	2.7
@@ -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: genmarble.c,v 2.7 2003/11/16 10:29:38 schorsch Exp $";
 #endif
-
 /*
  *  genmarble.c - generate a marble with bubbles inside.
  *
@@ -12,6 +9,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  <stdio.h>
 
+#include <stdlib.h>
+
 #include  <math.h>
 
 #include  "random.h"
@@ -20,13 +19,10 @@ static char SCCSid[] = "$SunId$ LBL";
 
 typedef double  FVECT[3];
 
-double  bubble();	/* pretty cute, huh? */
+static double  bubble();	/* pretty cute, huh? */
+static void sphere_cart();
 
-#ifdef  DCL_ATOF
-extern double  atof();
-#endif
-
-
+int
 main(argc, argv)
 int  argc;
 char  **argv;
@@ -72,7 +68,7 @@ char  **argv;
 }
 
 
-double
+static double
 bubble(v, cent, rad, bubrad)	/* compute location of random bubble */
 FVECT  v, cent;
 double  rad, bubrad;
@@ -89,6 +85,7 @@ double  rad, bubrad;
 }
 
 
+static void
 sphere_cart(v, ro, theta, phi)	/* spherical to cartesian coord. conversion */
 FVECT  v;
 double  ro, theta, phi;