--- ray/src/common/rglsrc.c	1998/06/09 11:18:36	3.1
+++ ray/src/common/rglsrc.c	2003/02/22 02:07:22	3.3
@@ -1,13 +1,67 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rglsrc.c,v 3.3 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  * Routines for handling OpenGL light sources
  */
 
+/* ====================================================================
+ * 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"
 
 double	expval = 0.;			/* global exposure value */
@@ -16,7 +70,7 @@ COLOR	ambval = {0.2, 0.2, 0.2};	/* global ambient valu
 
 int	dolights = MAXLIGHTS;		/* do how many more light sources? */
 
-static int	lightid[MAXLIGHTS] = {GL_LIGHT0, GL_LIGHT1, GL_LIGHT2,
+int	glightid[MAXLIGHTS] = {GL_LIGHT0, GL_LIGHT1, GL_LIGHT2,
 			GL_LIGHT3, GL_LIGHT4, GL_LIGHT5, GL_LIGHT6, GL_LIGHT7};
 
 static int	lightlist;		/* light list id */
@@ -37,9 +91,10 @@ static struct {
 
 static int	nlights;		/* number of defined lights */
 
-static int	l_flatsrc(), l_spheresrc(), l_source();
+static void	l_flatsrc(), l_sphsrc(), l_source();
 
 
+void
 lightinit()			/* initialize lighting */
 {
 	GLfloat	ambv[4];
@@ -61,6 +116,7 @@ lightinit()			/* initialize lighting */
 }
 
 
+void
 lightclean()			/* clean up light source commands */
 {
 	if ((dolights += nlights) <= 0)
@@ -69,6 +125,7 @@ lightclean()			/* clean up light source commands */
 }
 
 
+void
 lightdefs()			/* define light source list */
 {
 	register int	i;
@@ -98,6 +155,7 @@ lightdefs()			/* define light source list */
 }
 
 
+int
 o_source(o)			/* record a distant source */
 register OBJREC	*o;
 {
@@ -158,12 +216,12 @@ double	area;
 }
 
 
-static
+static void
 l_source(n)			/* convert a distant source */
 register int	n;
 {
 	register MATREC	*m = lightrec[n].m;
-	int	thislight = lightid[n];
+	int	thislight = glightid[n];
 	GLfloat	vec[4];
 						/* assign direction */
 	VCOPY(vec, lightrec[n].pos);
@@ -182,13 +240,13 @@ register int	n;
 }
 
 
-static
+static void
 l_flatsrc(n)			/* convert a flat source */
 register int	n;
 {
 	GLfloat	vec[4];
 	register MATREC	*m = lightrec[n].m;
-	int	thislight = lightid[n];
+	int	thislight = glightid[n];
 						/* assign position */
 	VCOPY(vec, lightrec[n].pos); vec[3] = 1.;
 	glLightfv(thislight, GL_POSITION, vec);
@@ -217,13 +275,13 @@ register int	n;
 }
 
 
-static
+static void
 l_sphsrc(n)			/* convert a spherical source */
 register int	n;
 {
 	GLfloat	vec[4];
 	register MATREC	*m = lightrec[n].m;
-	int	thislight = lightid[n];
+	int	thislight = glightid[n];
 						/* assign position */
 	VCOPY(vec, lightrec[n].pos); vec[3] = 1.;
 	glLightfv(thislight, GL_POSITION, vec);