--- ray/src/common/readoct.c 2003/06/08 12:03:09 2.18 +++ ray/src/common/readoct.c 2003/07/21 22:30:17 2.21 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: readoct.c,v 2.18 2003/06/08 12:03:09 schorsch Exp $"; +static const char RCSid[] = "$Id: readoct.c,v 2.21 2003/07/21 22:30:17 schorsch Exp $"; #endif /* * readoct.c - routines to read octree information. @@ -8,6 +8,7 @@ static const char RCSid[] = "$Id: readoct.c,v 2.18 200 #include "copyright.h" #include +#include #include "standard.h" #include "platform.h" @@ -16,13 +17,13 @@ static const char RCSid[] = "$Id: readoct.c,v 2.18 200 #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 */ @@ -98,7 +99,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 +112,7 @@ char *ofn[]; if (dosets(nonsurfinset)) octerror(USER, "modifier in tree; octree stale?"); } + } /* close the input */ if (infn[0] == '!') pclose(infp);