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

Comparing ray/src/common/otypes.h (file contents):
Revision 2.10 by greg, Tue Mar 11 19:29:04 2003 UTC vs.
Revision 2.15 by schorsch, Sun Mar 28 20:33:12 2004 UTC

# Line 2 | Line 2
2   /*
3   *  otypes.h - defines for object types.
4   */
5 + #ifndef _RAD_OTYPES_H_
6 + #define _RAD_OTYPES_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
6 #include "copyright.h"
7
11   typedef struct {
12          char  *funame;                  /* function name */
13          int  flags;                     /* type flags */
14 + #ifdef FUN_ARGLIST
15 +        int  (*funp)(FUN_ARGLIST);      /* pointer to function */
16 + #else
17          int  (*funp)();                 /* pointer to function */
18 + #endif
19   }  FUN;
20 +
21 + #ifdef FUN_ARGLIST
22 + extern int  o_default(FUN_ARGLIST);
23 + #else
24 + extern int  o_default(); /* XXX conflict with radogl.h */
25 + #endif
26 +
27 + /* extern void initotypes(void);*/ /* XXX don't mess with the linker... */
28 +
29                                  /* object types in decreasing frequency */
30   #define  OBJ_FACE       0               /* polygon */
31   #define  OBJ_CONE       1               /* cone */
# Line 97 | Line 113 | extern FUN  ofun[];                    /* our type list */
113   #define  hastext(t)     (ofun[t].flags & T_E)
114   #define  isflat(t)      ((t)==OBJ_FACE || (t)==OBJ_RING)
115  
100 extern int  o_default();
101
116   #define  ALIASKEY       "alias"                 /* alias keyword */
117   #define  ALIASMOD       "inherit"               /* inherit target modifier */
118  
# Line 154 | Line 168 | extern int  o_default();
168                                  { "prism1",     T_M|T_F|T_LV,   o_default }, \
169                                  { "prism2",     T_M|T_F|T_LV,   o_default }, \
170                          }
171 +
172 +
173 + #ifdef __cplusplus
174 + }
175 + #endif
176 + #endif /* _RAD_OTYPES_H_ */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines