--- ray/src/common/readmesh.c	2003/06/20 00:25:49	2.6
+++ ray/src/common/readmesh.c	2004/09/14 02:53:50	2.13
@@ -1,17 +1,24 @@
 #ifndef lint
-static const char RCSid[] = "$Id: readmesh.c,v 2.6 2003/06/20 00:25:49 greg Exp $";
+static const char RCSid[] = "$Id: readmesh.c,v 2.13 2004/09/14 02:53:50 greg Exp $";
 #endif
 /*
  *  Routines for reading a compiled mesh from a file
  */
 
-#include  "standard.h"
+#include  <time.h>
+
 #include  "platform.h"
+#include  "standard.h"
 #include  "octree.h"
 #include  "object.h"
 #include  "mesh.h"
 #include  "resolu.h"
 
+#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
+#undef getc
+#define getc    getc_unlocked
+#endif
+
 static char	*meshfn;	/* input file name */
 static FILE	*meshfp;	/* mesh file pointer */
 static int	objsize;	/* sizeof(OBJECT) from writer */
@@ -90,7 +97,7 @@ gettree()				/* get a pre-ordered octree */
 		default:
 			mesherror(USER, "damaged mesh octree");
 	}
-	return NULL; /* pro forma return */
+	return (OCTREE)NULL; /* pro forma return */
 }