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

Comparing ray/src/common/object.h (file contents):
Revision 2.15 by schorsch, Thu Jun 26 00:58:09 2003 UTC vs.
Revision 2.19 by greg, Fri Sep 7 21:45:22 2012 UTC

# Line 10 | Line 10
10   extern "C" {
11   #endif
12  
13 – #include "copyright.h"
14 –
13   #ifndef  OCTREE
14   #define  OCTREE         int
15   #endif
# Line 24 | Line 22 | extern "C" {
22   */
23  
24   typedef struct {
27 –        short  nsargs;                  /* # of string arguments */
28 –        short  nfargs;                  /* # of real arguments */
25          char  **sarg;                   /* string arguments */
26          RREAL  *farg;                   /* real arguments */
27 +        short  nsargs;                  /* # of string arguments */
28 +        short  nfargs;                  /* # of real arguments */
29   #ifdef  IARGS
30          short  niargs;                  /* # of integer arguments */
31          long  *iarg;                    /* integer arguments */
32   #endif
33   }  FUNARGS;
34  
35 < #define  MAXSTR         128             /* maximum string length */
35 > #define  MAXSTR         512             /* maximum string (word) length */
36  
37   /*
38   *      An object is defined as an index into an array of
# Line 117 | Line 115 | extern void    freefargs(FUNARGS *fa);
115                                          /* defined in readobj.c */
116   extern void     readobj(char *inpspec);
117   extern void     getobject(char *name, FILE *fp);
118 < extern OBJECT   newobject();
118 > extern OBJECT   newobject(void);
119   extern void     freeobjects(int firstobj, int nobjs);
120                                          /* defined in free_os.c */
121   extern int      free_os(OBJREC *op);

Diff Legend

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