--- ray/src/common/objset.c	1998/09/11 15:26:43	2.7
+++ ray/src/common/objset.c	2003/02/22 02:07:22	2.8
@@ -1,15 +1,69 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: objset.c,v 2.8 2003/02/22 02:07:22 greg Exp $";
 #endif
-
 /*
  *  objset.c - routines for maintaining object sets.
  *
- *	7/28/85
+ *  External symbols declared in object.h
  */
 
+/* ====================================================================
+ * 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  "standard.h"
 
 #include  "octree.h"
@@ -27,6 +81,7 @@ static char SCCSid[] = "$SunId$ LBL";
 static OBJECT  *ostable[OSTSIZ];	/* the object set table */
 
 
+void
 insertelem(os, obj)		/* insert obj into os, no questions */
 register OBJECT  *os;
 OBJECT  obj;
@@ -42,6 +97,7 @@ OBJECT  obj;
 }
 
 
+void
 deletelem(os, obj)		/* delete obj from os, no questions */
 register OBJECT  *os;
 OBJECT  obj;
@@ -61,6 +117,7 @@ OBJECT  obj;
 }
 
 
+int
 inset(os, obj)			/* determine if object is in set */
 register OBJECT  *os;
 OBJECT  obj;
@@ -92,6 +149,7 @@ OBJECT  obj;
 }
 
 
+int
 setequal(os1, os2)		/* determine if two sets are equal */
 register OBJECT  *os1, *os2;
 {
@@ -104,6 +162,7 @@ register OBJECT  *os1, *os2;
 }
 
 
+void
 setcopy(os1, os2)		/* copy object set os2 into os1 */
 register OBJECT  *os1, *os2;
 {
@@ -130,6 +189,7 @@ register OBJECT  *os;
 }
 
 
+void
 setunion(osr, os1, os2)		/* osr = os1 Union os2 */
 register OBJECT  *osr, *os1, *os2;
 {
@@ -149,6 +209,7 @@ register OBJECT  *osr, *os1, *os2;
 }
 
 
+void
 setintersect(osr, os1, os2)	/* osr = os1 Intersect os2 */
 register OBJECT  *osr, *os1, *os2;
 {
@@ -226,6 +287,7 @@ memerr:
 }
 
 
+void
 objset(oset, ot)		/* get object set for full node */
 register OBJECT  *oset;
 OCTREE  ot;
@@ -269,13 +331,14 @@ int	(*f)();
 }
 
 
+void
 donesets()			/* free ALL SETS in our table */
 {
 	register int  n;
 
 	for (n = 0; n < OSTSIZ; n++) 
 		if (ostable[n] != NULL) {
-			free((char *)ostable[n]);
+			free((void *)ostable[n]);
 			ostable[n] = NULL;
 		}
 }