ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/readmesh.c

Comparing ray/src/common/readmesh.c (file contents):
Revision 2.11 by greg, Fri Jan 30 00:08:31 2004 UTC vs.
Revision 2.14 by greg, Wed Dec 15 17:26:28 2010 UTC

#	Line 14 | Line 14 | static const char RCSid[] = "$Id$";
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 (OCTREE)NULL; /* pro forma return */
100	>	return (OCTREE)0;       /* pro forma return */
101		}
102
103

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)