--- ray/src/common/readoct.c	2003/06/07 12:50:20	2.17
+++ ray/src/common/readoct.c	2003/07/17 09:21:29	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: readoct.c,v 2.17 2003/06/07 12:50:20 schorsch Exp $";
+static const char	RCSid[] = "$Id: readoct.c,v 2.20 2003/07/17 09:21:29 schorsch Exp $";
 #endif
 /*
  *  readoct.c - routines to read octree information.
@@ -8,24 +8,22 @@ static const char	RCSid[] = "$Id: readoct.c,v 2.17 200
 #include "copyright.h"
 
 #include  <stdio.h>
-#ifdef _WIN32
- #define popen _popen
- #define pclose _pclose
-#endif
+#include  <time.h>
 
 #include  "standard.h"
+#include  "platform.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 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(), gettree();
+static OCTREE  getfullnode(void), gettree(void);
 
 static char  *infn;			/* input file specification */
 static FILE  *infp;			/* input file stream */