--- ray/src/common/rglfile.c	1999/01/29 15:27:22	3.3
+++ ray/src/common/rglfile.c	2003/02/22 02:07:22	3.4
@@ -1,31 +1,79 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rglfile.c,v 3.4 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  * Load Radiance object(s) and create OpenGL display lists
  */
 
+/* ====================================================================
+ * The Radiance Software License, Version 1.0
+ *
+ * Copyright (c) 1990 - 2002 The Regents of the University of California,
+ * through Lawrence Berkeley National Laboratory.   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *         notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
+ *       distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *           if any, must include the following acknowledgment:
+ *             "This product includes Radiance software
+ *                 (http://radsite.lbl.gov/)
+ *                 developed by the Lawrence Berkeley National Laboratory
+ *               (http://www.lbl.gov/)."
+ *       Alternately, this acknowledgment may appear in the software itself,
+ *       if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
+ *       and "The Regents of the University of California" must
+ *       not be used to endorse or promote products derived from this
+ *       software without prior written permission. For written
+ *       permission, please contact radiance@radsite.lbl.gov.
+ *
+ * 5. Products derived from this software may not be called "Radiance",
+ *       nor may "Radiance" appear in their name, without prior written
+ *       permission of Lawrence Berkeley National Laboratory.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
+ * information on Lawrence Berkeley National Laboratory, please see
+ * <http://www.lbl.gov/>.
+ */
+
 #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 +129,7 @@ newglist()			/* allocate an OGL list id */
 }
 
 
+void
 rgl_checkerr(where)		/* check for GL or GLU error */
 char	*where;
 {
@@ -149,6 +198,7 @@ int	*nl;			/* returned number of lists (optional) */
 }
 
 
+void
 rgl_load(inpspec)		/* convert scene description into OGL calls */
 char	*inpspec;
 {
@@ -191,6 +241,7 @@ char	*inpspec;
 }
 
 
+void
 rgl_object(name, fp)			/* read the next object */
 char  *name;
 FILE  *fp;