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

Comparing ray/src/common/readmesh.c (file contents):
Revision 2.7 by greg, Wed Jul 16 01:32:53 2003 UTC vs.
Revision 2.13 by greg, Tue Sep 14 02:53:50 2004 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7  
8   #include  <time.h>
9  
10 #include  "standard.h"
10   #include  "platform.h"
11 + #include  "standard.h"
12   #include  "octree.h"
13   #include  "object.h"
14   #include  "mesh.h"
15   #include  "resolu.h"
16  
17 + #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
18 + #undef getc
19 + #define getc    getc_unlocked
20 + #endif
21 +
22   static char     *meshfn;        /* input file name */
23   static FILE     *meshfp;        /* mesh file pointer */
24   static int      objsize;        /* sizeof(OBJECT) from writer */
# Line 92 | Line 97 | gettree()                              /* get a pre-ordered octree */
97                  default:
98                          mesherror(USER, "damaged mesh octree");
99          }
100 <        return NULL; /* pro forma return */
100 >        return (OCTREE)NULL; /* pro forma return */
101   }
102  
103  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines