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

Comparing ray/src/ot/initotypes.c (file contents):
Revision 2.3 by greg, Tue Mar 11 17:08:55 2003 UTC vs.
Revision 2.4 by schorsch, Sat Mar 27 12:41:45 2004 UTC

# Line 6 | Line 6 | static const char      RCSid[] = "$Id$";
6   */
7  
8   #include  "standard.h"
9 –
9   #include  "octree.h"
11 –
10   #include  "otypes.h"
11 + #include  "oconv.h"
12  
13 < extern int  o_sphere();
13 > extern int  o_sphere(); /* XXX way too much linker magic involved here */
14   extern int  o_face();
15   extern int  o_cone();
16   extern int  o_instance();
# Line 19 | Line 18 | extern int  o_mesh();
18  
19   FUN  ofun[NUMOTYPE] = INIT_OTYPE;
20  
21 <
22 < initotypes()                    /* initialize ofun array */
21 > void
22 > ot_initotypes(void)                     /* initialize ofun array */
23   {
24          ofun[OBJ_SPHERE].funp =
25          ofun[OBJ_BUBBLE].funp = o_sphere;
# Line 35 | Line 34 | initotypes()                   /* initialize ofun array */
34   }
35  
36  
37 < o_default()                     /* default action is no intersection */
37 > int
38 > o_default(void)                 /* default action is no intersection */
39   {
40          return(O_MISS);
41   }

Diff Legend

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