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.14 by greg, Fri Nov 21 07:15:29 2003 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();
25 + #endif
26                                  /* object types in decreasing frequency */
27   #define  OBJ_FACE       0               /* polygon */
28   #define  OBJ_CONE       1               /* cone */
# Line 97 | Line 110 | extern FUN  ofun[];                    /* our type list */
110   #define  hastext(t)     (ofun[t].flags & T_E)
111   #define  isflat(t)      ((t)==OBJ_FACE || (t)==OBJ_RING)
112  
100 extern int  o_default();
101
113   #define  ALIASKEY       "alias"                 /* alias keyword */
114   #define  ALIASMOD       "inherit"               /* inherit target modifier */
115  
# Line 154 | Line 165 | extern int  o_default();
165                                  { "prism1",     T_M|T_F|T_LV,   o_default }, \
166                                  { "prism2",     T_M|T_F|T_LV,   o_default }, \
167                          }
168 +
169 +
170 + #ifdef __cplusplus
171 + }
172 + #endif
173 + #endif /* _RAD_OTYPES_H_ */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines