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

Comparing ray/src/common/lamps.c (file contents):
Revision 2.7 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.10 by greg, Mon Feb 18 23:35:51 2008 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   #include  <stdio.h>
11   #include  <stdlib.h>
12   #include  <ctype.h>
13 +
14 + #include  "standard.h"
15   #include  "color.h"
16  
17   extern char     *eindex(), *expsave();
16 – extern FILE     *frlibopen();
18  
19   typedef struct lamp {
20          char    *pattern;                       /* search pattern */
# Line 25 | Line 26 | static LAMP    *lamps = NULL;          /* lamp list */
26  
27  
28   float *
29 < matchlamp(s)                            /* see if string matches any lamp */
30 < char    *s;
29 > matchlamp(                              /* see if string matches any lamp */
30 > char    *s
31 > )
32   {
33          register LAMP   *lp;
34  
# Line 39 | Line 41 | char   *s;
41   }
42  
43  
44 < loadlamps(file)                                 /* load lamp type file */
45 < char    *file;
44 > int
45 > loadlamps(                                      /* load lamp type file */
46 > char    *file
47 > )
48   {
49          LAMP    *lastp;
50          register LAMP   *lp;
# Line 126 | Line 130 | fmterr:
130   }
131  
132  
133 < freelamps()                     /* free our lamps list */
133 > void
134 > freelamps(void)                 /* free our lamps list */
135   {
136          register LAMP   *lp1, *lp2;
137          

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines