--- ray/src/common/standard.h	1991/10/23 13:43:09	1.7
+++ ray/src/common/standard.h	1991/10/24 08:37:58	1.9
@@ -16,7 +16,7 @@
 				/* regular transformation */
 typedef struct {
 	MAT4  xfm;				/* transform matrix */
-	double  sca;				/* scalefactor */
+	FLOAT  sca;				/* scalefactor */
 }  XF;
 				/* complemetary tranformation */
 typedef struct {
@@ -49,10 +49,10 @@ extern char  errmsg[];			/* global buffer for error me
 extern int  errno;			/* system error number */
 
 					/* memory operations */
-#ifdef  STRUCTASSIGN
-#define  copystruct(d,s)	(*(d) = *(s))
-#else
+#ifdef  NOSTRUCTASS
 #define  copystruct(d,s)	bcopy((char *)(s),(char *)(d),sizeof(*(d)))
+#else
+#define  copystruct(d,s)	(*(d) = *(s))
 #endif
 
 #ifndef  BSD