--- ray/src/rt/data.h	1990/04/03 17:24:33	1.2
+++ ray/src/rt/data.h	1995/06/30 16:07:42	2.2
@@ -8,12 +8,11 @@
  *     6/4/86
  */
 
-#define  MAXDIM		8		/* maximum dimensions for data array */
+#define  MAXDDIM	8		/* maximum dimensions for data array */
 
 #define  DATATYPE	float		/* single precision to save space */
+#define  DATATY		'f'		/* format for DATATYPE */
 
-#define  DSCANF		"%f"		/* scan format for DATATYPE */
-
 typedef struct datarray {
 	char  *name;			/* name of our data */
 	int  nd;			/* number of dimensions */
@@ -21,7 +20,7 @@ typedef struct datarray {
 		double  org, siz;		/* coordinate domain */
 		int  ne;			/* number of elements */
 		double  *p;			/* point locations */
-	} dim[MAXDIM];			/* dimension specifications */
+	} dim[MAXDDIM];			/* dimension specifications */
 	DATATYPE  *arr;			/* the data */
 	struct datarray  *next;		/* next array in list */
 } DATARRAY;			/* a data array */