--- ray/src/common/readobj.c 2003/06/07 12:50:20 2.13 +++ ray/src/common/readobj.c 2003/06/20 00:25:49 2.15 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: readobj.c,v 2.13 2003/06/07 12:50:20 schorsch Exp $"; +static const char RCSid[] = "$Id: readobj.c,v 2.15 2003/06/20 00:25:49 greg Exp $"; #endif /* * readobj.c - routines for reading in object descriptions. @@ -11,12 +11,10 @@ static const char RCSid[] = "$Id: readobj.c,v 2.13 200 #include #include -#ifdef _WIN32 - #define popen _popen - #define pclose _pclose -#endif +#include #include "standard.h" +#include "platform.h" #include "object.h" #include "otypes.h" @@ -167,7 +165,7 @@ newobject() /* get a new object */ void freeobjects(firstobj, nobjs) /* free a range of objects */ -OBJECT firstobj, nobjs; +int firstobj, nobjs; { register int obj; /* check bounds */