--- ray/src/common/vars.h	2003/02/25 02:47:22	2.4
+++ ray/src/common/vars.h	2003/07/30 10:11:06	2.7
@@ -1,16 +1,19 @@
-/* RCSid $Id: vars.h,v 2.4 2003/02/25 02:47:22 greg Exp $ */
+/* RCSid $Id: vars.h,v 2.7 2003/07/30 10:11:06 schorsch Exp $ */
 /*
  *  Header for programs that load variable files.
  */
+#ifndef _RAD_VARS_H_
+#define _RAD_VARS_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include "copyright.h"
-
-typedef struct {
+typedef struct variable_s {
 	char	*name;		/* variable name */
 	short	nick;		/* # characters required for nickname */
 	short	nass;		/* # assignments made */
 	char	*value;		/* assigned value(s) */
-	void	(*fixval)();	/* assignment checking function */
+	void	(*fixval)(struct variable_s *);	/* assignment checking function */
 } VARIABLE;		/* a variable-value pair */
 
 /**** The following variables should be declared by calling program ****/
@@ -43,26 +46,9 @@ extern char	*nvalue();
 #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 int	setvariable(char *ass, VARIABLE *(*mv)(char*));
 extern VARIABLE	*matchvar(char *nam);
 extern char	*nvalue(int vn, int n);
 extern void	checkvalues(void);
@@ -75,4 +61,9 @@ extern void	intvalue(VARIABLE *vp);
 extern void	fltvalue(VARIABLE *vp);
 extern void	printvars(FILE *fp);
 
+
+#ifdef __cplusplus
+}
 #endif
+#endif /* _RAD_VARS_H_ */
+