--- ray/src/rt/func.c	2003/08/04 22:37:53	2.20
+++ ray/src/rt/func.c	2011/02/22 16:45:12	2.24
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: func.c,v 2.20 2003/08/04 22:37:53 greg Exp $";
+static const char	RCSid[] = "$Id: func.c,v 2.24 2011/02/22 16:45:12 greg Exp $";
 #endif
 /*
  *  func.c - interface to calcomp functions.
@@ -8,9 +8,8 @@ static const char	RCSid[] = "$Id: func.c,v 2.20 2003/0
 #include "copyright.h"
 
 #include  "ray.h"
-
+#include  "paths.h"
 #include  "otypes.h"
-
 #include  "func.h"
 
 
@@ -34,12 +33,13 @@ static RAY  *fray = NULL;	/* current function ray */
 static double  l_erf(char *), l_erfc(char *), l_arg(char *);
 
 
-MFUNC *
-getfunc(m, ff, ef, dofwd)	/* get function for this modifier */
-OBJREC  *m;
-int  ff;
-unsigned int  ef;
-int  dofwd;
+extern MFUNC *
+getfunc(	/* get function for this modifier */
+	OBJREC  *m,
+	int  ff,
+	unsigned int  ef,
+	int  dofwd
+)
 {
 	static char  initfile[] = INITFILE;
 	char  sbuf[MAXSTR];
@@ -131,12 +131,14 @@ toofew:
 	objerror(m, USER, "too few string arguments");
 memerr:
 	error(SYSTEM, "out of memory in getfunc");
+	return NULL; /* pro forma return */
 }
 
 
-void
-freefunc(m)			/* free memory associated with modifier */
-OBJREC  *m;
+extern void
+freefunc(			/* free memory associated with modifier */
+	OBJREC  *m
+)
 {
 	register MFUNC  *f;
 	register int  i;
@@ -163,12 +165,13 @@ OBJREC  *m;
 }
 
 
-int
-setfunc(m, r)			/* set channels for function call */
-OBJREC  *m;
-register RAY  *r;
+extern int
+setfunc(			/* set channels for function call */
+	OBJREC  *m,
+	register RAY  *r
+)
 {
-	static unsigned long  lastrno = ~0;
+	static RNUMBER  lastrno = ~0;
 	register MFUNC  *f;
 					/* get function */
 	if ((f = (MFUNC *)m->os) == NULL)
@@ -194,9 +197,10 @@ register RAY  *r;
 }
 
 
-void
-loadfunc(fname)			/* load definition file */
-char  *fname;
+extern void
+loadfunc(			/* load definition file */
+	char  *fname
+)
 {
 	char  *ffname;
 
@@ -232,8 +236,6 @@ l_arg(char *nm)			/* return nth real argument */
 static double
 l_erf(char *nm)			/* error function */
 {
-	extern double  erf();
-
 	return(erf(argument(1)));
 }
 
@@ -241,15 +243,14 @@ l_erf(char *nm)			/* error function */
 static double
 l_erfc(char *nm)		/* cumulative error function */
 {
-	extern double  erfc();
-
 	return(erfc(argument(1)));
 }
 
 
-double
-chanvalue(n)			/* return channel n to calcomp */
-register int  n;
+extern double
+chanvalue(			/* return channel n to calcomp */
+	register int  n
+)
 {
 	if (fray == NULL)
 		syntax("ray parameter used in constant expression");