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

Comparing ray/src/common/readoct.c (file contents):
Revision 2.16 by schorsch, Thu Jun 5 19:29:34 2003 UTC vs.
Revision 2.20 by schorsch, Thu Jul 17 09:21:29 2003 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 < #include  "standard.h"
10 > #include  <stdio.h>
11 > #include  <time.h>
12  
13 + #include  "standard.h"
14 + #include  "platform.h"
15   #include  "octree.h"
13
16   #include  "object.h"
15
17   #include  "otypes.h"
18 + #include  "resolu.h"
19  
20 < static double  ogetflt();
21 < static long  ogetint();
22 < static char  *ogetstr();
23 < static int  nonsurfinset();
24 < static int  octerror(), skiptree();
25 < static OCTREE  getfullnode(), gettree();
20 > static double  ogetflt(void);
21 > static long  ogetint(int);
22 > static char  *ogetstr(char *);
23 > static int  nonsurfinset(OBJECT *);
24 > static void  octerror(int  etyp, char  *msg);
25 > static void  skiptree(void);
26 > static OCTREE  getfullnode(void), gettree(void);
27  
28   static char  *infn;                     /* input file specification */
29   static FILE  *infp;                     /* input file stream */
# Line 197 | Line 200 | gettree()                      /* get a pre-ordered octree */
200          default:
201                  octerror(USER, "damaged octree");
202          }
203 +        return NULL; /* pro forma return */
204   }
205  
206  
# Line 215 | Line 219 | register OBJECT  *os;
219   }
220  
221  
222 < static
223 < skiptree()                              /* skip octree on input */
222 > static void
223 > skiptree(void)                          /* skip octree on input */
224   {
225          register int  i;
226          
# Line 240 | Line 244 | skiptree()                             /* skip octree on input */
244   }
245  
246  
247 < static
247 > static void
248   octerror(etyp, msg)                     /* octree error */
249   int  etyp;
250   char  *msg;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines