--- ray/src/common/object.h	1997/03/07 15:45:31	2.3
+++ ray/src/common/object.h	1999/01/19 16:01:54	2.7
@@ -1,6 +1,6 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1999 Silicon Graphics, Inc. */
 
-/* SCCSid "$SunId$ LBL" */
+/* SCCSid "$SunId$ SGI" */
 
 /*
  *  object.h - header file for routines using objects and object sets.
@@ -36,9 +36,9 @@ typedef struct {
 
 #ifndef  OBJECT
 #ifdef  BIGMEM
-#define  OBJECT		int		/* index to object array */
+#define  OBJECT		int4		/* index to object array */
 #else
-#define  OBJECT		short		/* index to object array */
+#define  OBJECT		int2		/* index to object array */
 #endif
 #endif
 
@@ -52,16 +52,18 @@ typedef struct {
 
 #ifndef  MAXOBJBLK
 #ifdef  BIGMEM
-#define  MAXOBJBLK	4095		/* maximum number of object blocks */
+#define  MAXOBJBLK	65535		/* maximum number of object blocks */
 #else
-#define  MAXOBJBLK	511		/* maximum number of object blocks */
+#define  MAXOBJBLK	63		/* maximum number of object blocks */
 #endif
 #endif
 
 extern OBJREC  *objblock[MAXOBJBLK];	/* the object blocks */
 extern OBJECT  nobjects;		/* # of objects */
 
-#define  objptr(obj)	(objblock[(obj)>>6]+((obj)&077))
+#define  OBJBLKSHFT	9
+#define  OBJBLKSIZ	(1<<OBJBLKSHFT)	/* object block size */
+#define  objptr(obj)	(objblock[(obj)>>OBJBLKSHFT]+((obj)&(OBJBLKSIZ-1)))
 
 #define  OVOID		(-1)		/* void object */
 #define  VOIDID		"void"		/* void identifier */