--- ray/src/common/rglfile.c	1999/01/29 15:27:22	3.3
+++ ray/src/common/rglfile.c	2003/02/25 02:47:22	3.5
@@ -1,31 +1,24 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rglfile.c,v 3.5 2003/02/25 02:47:22 greg Exp $";
 #endif
-
 /*
  * Load Radiance object(s) and create OpenGL display lists
  */
 
+#include "copyright.h"
+
 #include "radogl.h"
 
 #ifndef NLIST2ALLOC
 #define NLIST2ALLOC	16		/* batch of display lists to get */
 #endif
 
-extern int	o_sphere(), o_face(), o_cone(), o_ring(),
-		o_source(), o_instance();
-
-extern int	m_normal(), m_glass(), m_aniso(), m_brdf(), m_brdf2(),
-		m_light(), m_prism(), m_mirror();
-
 FUN  ofun[NUMOTYPE] = INIT_OTYPE;
 
 static int	nextlist, nlistleft = 0;
 
 
-static
+static void
 initotypes()			/* initialize ofun array */
 {
 	if (ofun[OBJ_SPHERE].funp == o_sphere)
@@ -81,6 +74,7 @@ newglist()			/* allocate an OGL list id */
 }
 
 
+void
 rgl_checkerr(where)		/* check for GL or GLU error */
 char	*where;
 {
@@ -149,6 +143,7 @@ int	*nl;			/* returned number of lists (optional) */
 }
 
 
+void
 rgl_load(inpspec)		/* convert scene description into OGL calls */
 char	*inpspec;
 {
@@ -191,6 +186,7 @@ char	*inpspec;
 }
 
 
+void
 rgl_object(name, fp)			/* read the next object */
 char  *name;
 FILE  *fp;