--- ray/src/common/objset.c 2003/02/25 02:47:21 2.9 +++ ray/src/common/objset.c 2003/05/15 05:13:35 2.11 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: objset.c,v 2.9 2003/02/25 02:47:21 greg Exp $"; +static const char RCSid[] = "$Id: objset.c,v 2.11 2003/05/15 05:13:35 greg Exp $"; #endif /* * objset.c - routines for maintaining object sets. @@ -16,10 +16,10 @@ static const char RCSid[] = "$Id: objset.c,v 2.9 2003/ #include "object.h" #ifndef OSTSIZ -#ifdef BIGMEM -#define OSTSIZ 262139 /* object table size (a prime!) */ -#else +#ifdef SMLMEM #define OSTSIZ 32749 /* object table size (a prime!) */ +#else +#define OSTSIZ 262139 /* object table size (a prime!) */ #endif #endif @@ -217,7 +217,7 @@ tryagain: /* remember position */ i = os - ostable[osentry]; os = ostable[osentry] = (OBJECT *)realloc( - (char *)ostable[osentry], + (void *)ostable[osentry], (unsigned)(i+oset[0]+2)*sizeof(OBJECT)); if (os == NULL) goto memerr;