ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/vars.h
(Generate patch)

Comparing ray/src/common/vars.h (file contents):
Revision 2.4 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.7 by schorsch, Wed Jul 30 10:11:06 2003 UTC

# Line 2 | Line 2
2   /*
3   *  Header for programs that load variable files.
4   */
5 + #ifndef _RAD_VARS_H_
6 + #define _RAD_VARS_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
11 < #include "copyright.h"
7 <
8 < typedef struct {
11 > typedef struct variable_s {
12          char    *name;          /* variable name */
13          short   nick;           /* # characters required for nickname */
14          short   nass;           /* # assignments made */
15          char    *value;         /* assigned value(s) */
16 <        void    (*fixval)();    /* assignment checking function */
16 >        void    (*fixval)(struct variable_s *); /* assignment checking function */
17   } VARIABLE;             /* a variable-value pair */
18  
19   /**** The following variables should be declared by calling program ****/
# Line 43 | Line 46 | extern char    *nvalue();
46   #define MEDIUM          'M'
47   #define LOW             'L'
48  
46 #ifdef NOPROTO
49  
48 extern void     loadvars();
49 extern int      setvariable();
50 extern VARIABLE *matchvar();
51 extern char     *nvalue();
52 extern void     checkvalues();
53 extern void     onevalue();
54 extern void     catvalues();
55 extern int      badmatch();
56 extern void     boolvalue();
57 extern void     qualvalue();
58 extern void     intvalue();
59 extern void     fltvalue();
60 extern void     printvars();
61
62 #else
63
50   extern void     loadvars(char *rfname);
51 < extern int      setvariable(char *ass, VARIABLE *(*mv)());
51 > extern int      setvariable(char *ass, VARIABLE *(*mv)(char*));
52   extern VARIABLE *matchvar(char *nam);
53   extern char     *nvalue(int vn, int n);
54   extern void     checkvalues(void);
# Line 75 | Line 61 | extern void    intvalue(VARIABLE *vp);
61   extern void     fltvalue(VARIABLE *vp);
62   extern void     printvars(FILE *fp);
63  
64 +
65 + #ifdef __cplusplus
66 + }
67   #endif
68 + #endif /* _RAD_VARS_H_ */
69 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines