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.1 by greg, Tue Dec 12 13:26:35 1995 UTC vs.
Revision 2.4 by greg, Tue Feb 25 02:47:22 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1995 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid $Id$ */
2   /*
3   *  Header for programs that load variable files.
4   */
5  
6 + #include "copyright.h"
7 +
8   typedef struct {
9          char    *name;          /* variable name */
10          short   nick;           /* # characters required for nickname */
11          short   nass;           /* # assignments made */
12          char    *value;         /* assigned value(s) */
13 <        int     (*fixval)();    /* assignment checking function */
13 >        void    (*fixval)();    /* assignment checking function */
14   } VARIABLE;             /* a variable-value pair */
15  
16   /**** The following variables should be declared by calling program ****/
# Line 26 | Line 25 | extern int     nowarn;         /* global boolean to turn warnings
25  
26   /**** The rest is declared in loadvars.c ****/
27  
29 extern int      onevalue(), catvalues(), boolvalue(),
30                qualvalue(), fltvalue(), intvalue();
31
28   extern VARIABLE *matchvar();
29   extern char     *nvalue();
30  
# Line 38 | Line 34 | extern char    *nvalue();
34   #define vdef(vc)        (vv[vc].nass)
35   #define vval(vc)        (vv[vc].value)
36   #define vint(vc)        atoi(vval(vc))
37 + #define vflt(vc)        atof(vval(vc))
38   #define vlet(vc)        UPPER(vval(vc)[0])
39   #define vscale          vlet
40   #define vbool(vc)       (vlet(vc)=='T')
# Line 45 | Line 42 | extern char    *nvalue();
42   #define HIGH            'H'
43   #define MEDIUM          'M'
44   #define LOW             'L'
45 +
46 + #ifdef NOPROTO
47 +
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 +
64 + extern void     loadvars(char *rfname);
65 + extern int      setvariable(char *ass, VARIABLE *(*mv)());
66 + extern VARIABLE *matchvar(char *nam);
67 + extern char     *nvalue(int vn, int n);
68 + extern void     checkvalues(void);
69 + extern void     onevalue(VARIABLE *vp);
70 + extern void     catvalues(VARIABLE *vp);
71 + extern int      badmatch(char *tv, char *cv);
72 + extern void     boolvalue(VARIABLE *vp);
73 + extern void     qualvalue(VARIABLE *vp);
74 + extern void     intvalue(VARIABLE *vp);
75 + extern void     fltvalue(VARIABLE *vp);
76 + extern void     printvars(FILE *fp);
77 +
78 + #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines