--- ray/src/common/readobj.c 2003/03/11 19:29:04 2.11 +++ ray/src/common/readobj.c 2003/06/07 12:50:20 2.13 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: readobj.c,v 2.11 2003/03/11 19:29:04 greg Exp $"; +static const char RCSid[] = "$Id: readobj.c,v 2.13 2003/06/07 12:50:20 schorsch Exp $"; #endif /* * readobj.c - routines for reading in object descriptions. @@ -9,13 +9,17 @@ static const char RCSid[] = "$Id: readobj.c,v 2.11 200 #include "copyright.h" -#include "standard.h" +#include +#include +#ifdef _WIN32 + #define popen _popen + #define pclose _pclose +#endif +#include "standard.h" #include "object.h" - #include "otypes.h" -#include OBJREC *objblock[MAXOBJBLK]; /* our objects */ OBJECT nobjects = 0; /* # of objects */ @@ -179,7 +183,7 @@ OBJECT firstobj, nobjs; free_os(o); /* free client memory */ freeqstr(o->oname); freefargs(&o->oargs); - bzero(o, sizeof(OBJREC)); + bzero((void *)o, sizeof(OBJREC)); } clearobjndx(); /* free objects off end */