--- ray/src/common/object.h	2003/06/06 16:38:47	2.13
+++ ray/src/common/object.h	2013/12/08 18:59:53	2.20
@@ -1,6 +1,8 @@
-/* RCSid $Id: object.h,v 2.13 2003/06/06 16:38:47 schorsch Exp $ */
+/* RCSid $Id: object.h,v 2.20 2013/12/08 18:59:53 greg Exp $ */
 /*
  *  object.h - header file for routines using objects and object sets.
+ *
+ *  Include after "standard.h"
  */
 #ifndef _RAD_OBJECT_H_
 #define _RAD_OBJECT_H_
@@ -8,8 +10,6 @@
 extern "C" {
 #endif
 
-#include "copyright.h"
-
 #ifndef  OCTREE
 #define  OCTREE		int
 #endif
@@ -22,17 +22,17 @@ extern "C" {
  */
 
 typedef struct {
+	char  **sarg;			/* string arguments */
+	RREAL  *farg;			/* real arguments */
 	short  nsargs;			/* # of string arguments */
 	short  nfargs;			/* # of real arguments */
-	char  **sarg;			/* string arguments */
-	FLOAT  *farg;			/* real arguments */
 #ifdef  IARGS
 	short  niargs;			/* # of integer arguments */
 	long  *iarg;			/* integer arguments */
 #endif
 }  FUNARGS;
 
-#define  MAXSTR		128		/* maximum string length */
+#define  MAXSTR		512		/* maximum string (word) length */
 
 /*
  *	An object is defined as an index into an array of
@@ -42,9 +42,9 @@ typedef struct {
 
 #ifndef  OBJECT
 #ifdef  SMLMEM
-#define  OBJECT		int2		/* index to object array */
+#define  OBJECT		int16		/* index to object array */
 #else
-#define  OBJECT		int4		/* index to object array */
+#define  OBJECT		int32		/* index to object array */
 #endif
 #endif
 
@@ -90,6 +90,7 @@ extern OBJECT	objndx(OBJREC *op);
 extern OBJECT	lastmod(OBJECT obj, char *mname);
 extern OBJECT	modifier(char *name);
 extern OBJECT	object(char *oname);
+extern int	eqobjects(OBJECT obj1, OBJECT obj2);
 extern void	insertobject(OBJECT obj);
 extern void	clearobjndx(void);
 					/* defined in objset.c */
@@ -115,7 +116,7 @@ extern void	freefargs(FUNARGS *fa);
 					/* defined in readobj.c */
 extern void	readobj(char *inpspec);
 extern void	getobject(char *name, FILE *fp);
-extern OBJECT	newobject();
+extern OBJECT	newobject(void);
 extern void	freeobjects(int firstobj, int nobjs);
 					/* defined in free_os.c */
 extern int	free_os(OBJREC *op);