--- ray/src/common/vars.h	1996/01/05 14:42:13	2.2
+++ ray/src/common/vars.h	2003/02/22 02:07:22	2.3
@@ -1,17 +1,71 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid: $Id: vars.h,v 2.3 2003/02/22 02:07:22 greg Exp $ */
 /*
  *  Header for programs that load variable files.
  */
 
+/* ====================================================================
+ * 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/>.
+ */
+
 typedef struct {
 	char	*name;		/* variable name */
 	short	nick;		/* # characters required for nickname */
 	short	nass;		/* # assignments made */
 	char	*value;		/* assigned value(s) */
-	int	(*fixval)();	/* assignment checking function */
+	void	(*fixval)();	/* assignment checking function */
 } VARIABLE;		/* a variable-value pair */
 
 /**** The following variables should be declared by calling program ****/
@@ -26,9 +80,6 @@ extern int	nowarn;		/* global boolean to turn warnings
 
 /**** The rest is declared in loadvars.c ****/
 
-extern int	onevalue(), catvalues(), boolvalue(),
-		qualvalue(), fltvalue(), intvalue();
-
 extern VARIABLE	*matchvar();
 extern char	*nvalue();
 
@@ -46,3 +97,37 @@ extern char	*nvalue();
 #define HIGH		'H'
 #define MEDIUM		'M'
 #define LOW		'L'
+
+#ifdef NOPROTO
+
+extern void	loadvars();
+extern int	setvariable();
+extern VARIABLE	*matchvar();
+extern char	*nvalue();
+extern void	checkvalues();
+extern void	onevalue();
+extern void	catvalues();
+extern int	badmatch();
+extern void	boolvalue();
+extern void	qualvalue();
+extern void	intvalue();
+extern void	fltvalue();
+extern void	printvars();
+
+#else
+
+extern void	loadvars(char *rfname);
+extern int	setvariable(char *ass, VARIABLE *(*mv)());
+extern VARIABLE	*matchvar(char *nam);
+extern char	*nvalue(int vn, int n);
+extern void	checkvalues(void);
+extern void	onevalue(VARIABLE *vp);
+extern void	catvalues(VARIABLE *vp);
+extern int	badmatch(char *tv, char *cv);
+extern void	boolvalue(VARIABLE *vp);
+extern void	qualvalue(VARIABLE *vp);
+extern void	intvalue(VARIABLE *vp);
+extern void	fltvalue(VARIABLE *vp);
+extern void	printvars(FILE *fp);
+
+#endif