--- ray/src/rt/func.c	2003/05/13 17:58:33	2.18
+++ ray/src/rt/func.c	2004/02/12 18:55:50	2.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: func.c,v 2.18 2003/05/13 17:58:33 greg Exp $";
+static const char	RCSid[] = "$Id: func.c,v 2.21 2004/02/12 18:55:50 greg Exp $";
 #endif
 /*
  *  func.c - interface to calcomp functions.
@@ -9,6 +9,8 @@ static const char	RCSid[] = "$Id: func.c,v 2.18 2003/0
 
 #include  "ray.h"
 
+#include  "paths.h"
+
 #include  "otypes.h"
 
 #include  "func.h"
@@ -31,7 +33,7 @@ XF  funcxf;			/* current transformation */
 static OBJREC  *fobj = NULL;	/* current function object */
 static RAY  *fray = NULL;	/* current function ray */
 
-static double  l_erf(), l_erfc(), l_arg();
+static double  l_erf(char *), l_erfc(char *), l_arg(char *);
 
 
 MFUNC *
@@ -185,9 +187,9 @@ register RAY  *r;
 			funcxf.sca = r->rox->b.sca * f->b->sca;
 			multmat4(funcxf.xfm, r->rox->b.xfm, f->b->xfm);
 		} else
-			copystruct(&funcxf, &r->rox->b);
+			funcxf = r->rox->b;
 	else
-		copystruct(&funcxf, f->b);
+		funcxf = *(f->b);
 	lastrno = r->rno;
 	eclock++;		/* notify expression evaluator */
 	return(1);
@@ -209,7 +211,7 @@ char  *fname;
 
 
 static double
-l_arg()				/* return nth real argument */
+l_arg(char *nm)			/* return nth real argument */
 {
 	register int  n;
 
@@ -230,7 +232,7 @@ l_arg()				/* return nth real argument */
 
 
 static double
-l_erf()				/* error function */
+l_erf(char *nm)			/* error function */
 {
 	extern double  erf();
 
@@ -239,7 +241,7 @@ l_erf()				/* error function */
 
 
 static double
-l_erfc()			/* cumulative error function */
+l_erfc(char *nm)		/* cumulative error function */
 {
 	extern double  erfc();