--- ray/src/gen/gensurf.c	1989/10/18 18:49:09	1.4
+++ ray/src/gen/gensurf.c	1990/01/19 00:03:08	1.5
@@ -16,17 +16,12 @@ static char SCCSid[] = "$SunId$ LBL";
  *	4/3/87
  */
 
-#include  <stdio.h>
-#include  "fvect.h"
+#include  "standard.h"
 
 #define  XNAME		"X_"			/* x function name */
 #define  YNAME		"Y_"			/* y function name */
 #define  ZNAME		"Z_"			/* z function name */
 
-#define  PI		3.14159265358979323846
-
-#define  FTINY		1e-7
-
 #define  ABS(x)		((x)>=0 ? (x) : -(x))
 
 #define  pvect(p)	printf(vformat, (p)[0], (p)[1], (p)[2])
@@ -334,7 +329,7 @@ double mat[4][4],inverse[4][4];
 	register int i,j,k;
 	register double temp;
 
-	bcopy(mat, m4tmp, sizeof(m4tmp));
+	bcopy((char *)mat, (char *)m4tmp, sizeof(m4tmp));
 					/* set inverse to identity */
 	for (i = 0; i < 4; i++)
 		for (j = 0; j < 4; j++)