ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.18 by schorsch, Sun Jun 8 12:03:09 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  
12 + #include  "standard.h"
13 + #include  "platform.h"
14   #include  "octree.h"
13 –
15   #include  "object.h"
15 –
16   #include  "otypes.h"
17 + #include  "resolu.h"
18  
19   static double  ogetflt();
20   static long  ogetint();
21   static char  *ogetstr();
22   static int  nonsurfinset();
23 < static int  octerror(), skiptree();
23 > static void  octerror(int  etyp, char  *msg);
24 > static void  skiptree(void);
25   static OCTREE  getfullnode(), gettree();
26  
27   static char  *infn;                     /* input file specification */
# Line 197 | Line 199 | gettree()                      /* get a pre-ordered octree */
199          default:
200                  octerror(USER, "damaged octree");
201          }
202 +        return NULL; /* pro forma return */
203   }
204  
205  
# Line 215 | Line 218 | register OBJECT  *os;
218   }
219  
220  
221 < static
222 < skiptree()                              /* skip octree on input */
221 > static void
222 > skiptree(void)                          /* skip octree on input */
223   {
224          register int  i;
225          
# Line 240 | Line 243 | skiptree()                             /* skip octree on input */
243   }
244  
245  
246 < static
246 > static void
247   octerror(etyp, msg)                     /* octree error */
248   int  etyp;
249   char  *msg;

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)