--- ray/src/common/readoct.c	2003/03/14 21:27:46	2.15
+++ ray/src/common/readoct.c	2004/09/14 02:53:50	2.26
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: readoct.c,v 2.15 2003/03/14 21:27:46 greg Exp $";
+static const char	RCSid[] = "$Id: readoct.c,v 2.26 2004/09/14 02:53:50 greg Exp $";
 #endif
 /*
  *  readoct.c - routines to read octree information.
@@ -7,21 +7,30 @@ static const char	RCSid[] = "$Id: readoct.c,v 2.15 200
 
 #include "copyright.h"
 
-#include  "standard.h"
+#include  <stdio.h>
+#include  <time.h>
 
+#include  "platform.h"
+#include  "rtprocess.h"
+#include  "standard.h"
 #include  "octree.h"
-
 #include  "object.h"
-
 #include  "otypes.h"
+#include  "resolu.h"
 
-static double  ogetflt();
-static long  ogetint();
-static char  *ogetstr();
-static int  nonsurfinset();
-static int  octerror(), skiptree();
-static OCTREE  getfullnode(), gettree();
+#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
+#undef getc
+#define getc    getc_unlocked
+#endif
 
+static double  ogetflt(void);
+static long  ogetint(int);
+static char  *ogetstr(char *);
+static int  nonsurfinset(OBJECT *);
+static void  octerror(int  etyp, char  *msg);
+static void  skiptree(void);
+static OCTREE  getfullnode(void), gettree(void);
+
 static char  *infn;			/* input file specification */
 static FILE  *infp;			/* input file stream */
 static int  objsize;			/* size of stored OBJECT's */
@@ -58,9 +67,7 @@ char  *ofn[];
 			error(SYSTEM, errmsg);
 		}
 	}
-#ifdef MSDOS
-	setmode(fileno(infp), O_BINARY);
-#endif
+	SET_FILE_BINARY(infp);
 					/* get header */
 	if (checkheader(infp, OCTFMT, load&IO_INFO ? stdout : (FILE *)NULL) < 0)
 		octerror(USER, "not an octree");
@@ -98,7 +105,7 @@ char  *ofn[];
 	else if (load & IO_SCENE && nf == 0)
 		skiptree();
 		
-	if (load & IO_SCENE)		/* get the scene */
+	if (load & IO_SCENE) {		/* get the scene */
 	    if (nf == 0) {
 					/* load binary scene data */
 		readscene(infp, objsize);
@@ -111,6 +118,7 @@ char  *ofn[];
 		if (dosets(nonsurfinset))
 			octerror(USER, "modifier in tree; octree stale?");
 	    }
+	}
 				/* close the input */
 	if (infn[0] == '!')
 		pclose(infp);
@@ -199,6 +207,7 @@ gettree()			/* get a pre-ordered octree */
 	default:
 		octerror(USER, "damaged octree");
 	}
+	return EMPTY; /* pro forma return */
 }
 
 
@@ -217,8 +226,8 @@ register OBJECT  *os;
 }
 
 
-static
-skiptree()				/* skip octree on input */
+static void
+skiptree(void)				/* skip octree on input */
 {
 	register int  i;
 	
@@ -242,7 +251,7 @@ skiptree()				/* skip octree on input */
 }
 
 
-static
+static void
 octerror(etyp, msg)			/* octree error */
 int  etyp;
 char  *msg;