--- ray/src/common/readmesh.c	2003/07/16 01:32:53	2.7
+++ ray/src/common/readmesh.c	2010/12/15 17:26:28	2.14
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: readmesh.c,v 2.7 2003/07/16 01:32:53 greg Exp $";
+static const char RCSid[] = "$Id: readmesh.c,v 2.14 2010/12/15 17:26:28 greg Exp $";
 #endif
 /*
  *  Routines for reading a compiled mesh from a file
@@ -7,13 +7,18 @@ static const char RCSid[] = "$Id: readmesh.c,v 2.7 200
 
 #include  <time.h>
 
-#include  "standard.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 */
@@ -92,7 +97,7 @@ gettree()				/* get a pre-ordered octree */
 		default:
 			mesherror(USER, "damaged mesh octree");
 	}
-	return NULL; /* pro forma return */
+	return (OCTREE)0;	/* pro forma return */
 }