--- ray/src/common/caldefn.c	2003/07/03 22:41:44	2.17
+++ ray/src/common/caldefn.c	2003/07/17 09:21:29	2.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: caldefn.c,v 2.17 2003/07/03 22:41:44 schorsch Exp $";
+static const char	RCSid[] = "$Id: caldefn.c,v 2.18 2003/07/17 09:21:29 schorsch Exp $";
 #endif
 /*
  *  Store variable definitions.
@@ -28,11 +28,10 @@ static const char	RCSid[] = "$Id: caldefn.c,v 2.17 200
 #include "copyright.h"
 
 #include  <stdio.h>
-
 #include  <string.h>
-
 #include  <ctype.h>
 
+#include  "rterror.h"
 #include  "calcomp.h"
 
 #ifndef	 NHASH
@@ -43,7 +42,7 @@ static const char	RCSid[] = "$Id: caldefn.c,v 2.17 200
 
 #define	 newnode()	(EPNODE *)ecalloc(1, sizeof(EPNODE))
 
-static double  dvalue();
+static double  dvalue(char  *name, EPNODE *d);
 
 #define  MAXCLOCK	(1L<<31)	/* clock wrap value */
 
@@ -689,11 +688,8 @@ getchan(void)			/* A -> $N = E1 */
  */
 
 
-static double
-dvalue(			/* evaluate a variable */
-char  *name,
-EPNODE	*d
-)
+static double			/* evaluate a variable */
+dvalue(char  *name, EPNODE	*d)
 {
     register EPNODE  *ep1, *ep2;