--- ray/src/common/readobj.c 2003/06/07 12:50:20 2.13 +++ ray/src/common/readobj.c 2003/10/27 10:19:31 2.18 @@ -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.18 2003/10/27 10:19:31 schorsch Exp $"; #endif /* * readobj.c - routines for reading in object descriptions. @@ -10,12 +10,11 @@ static const char RCSid[] = "$Id: readobj.c,v 2.13 200 #include "copyright.h" #include +#include #include -#ifdef _WIN32 - #define popen _popen - #define pclose _pclose -#endif +#include "platform.h" +#include "rtprocess.h" #include "standard.h" #include "object.h" #include "otypes.h" @@ -167,7 +166,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 */ @@ -183,7 +182,7 @@ OBJECT firstobj, nobjs; free_os(o); /* free client memory */ freeqstr(o->oname); freefargs(&o->oargs); - bzero((void *)o, sizeof(OBJREC)); + memset((void *)o, '\0', sizeof(OBJREC)); } clearobjndx(); /* free objects off end */