--- ray/src/common/object.h	2003/06/26 00:58:09	2.15
+++ ray/src/common/object.h	2012/09/07 21:45:22	2.19
@@ -1,4 +1,4 @@
-/* RCSid $Id: object.h,v 2.15 2003/06/26 00:58:09 schorsch Exp $ */
+/* RCSid $Id: object.h,v 2.19 2012/09/07 21:45:22 greg Exp $ */
 /*
  *  object.h - header file for routines using objects and object sets.
  *
@@ -10,8 +10,6 @@
 extern "C" {
 #endif
 
-#include "copyright.h"
-
 #ifndef  OCTREE
 #define  OCTREE		int
 #endif
@@ -24,17 +22,17 @@ extern "C" {
  */
 
 typedef struct {
-	short  nsargs;			/* # of string arguments */
-	short  nfargs;			/* # of real arguments */
 	char  **sarg;			/* string arguments */
 	RREAL  *farg;			/* real arguments */
+	short  nsargs;			/* # of string arguments */
+	short  nfargs;			/* # of 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
@@ -117,7 +115,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);