--- ray/src/common/calfunc.c 2003/03/05 16:16:52 2.10 +++ ray/src/common/calfunc.c 2003/07/17 09:21:29 2.12 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: calfunc.c,v 2.10 2003/03/05 16:16:52 greg Exp $"; +static const char RCSid[] = "$Id: calfunc.c,v 2.12 2003/07/17 09:21:29 schorsch Exp $"; #endif /* * calfunc.c - routines for calcomp using functions. @@ -13,11 +13,11 @@ static const char RCSid[] = "$Id: calfunc.c,v 2.10 200 #include "copyright.h" #include - +#include #include - #include +#include "rterror.h" #include "calcomp.h" /* bits in argument flag (better be right!) */ @@ -34,7 +34,7 @@ typedef struct activation { static ACTIVATION *curact = NULL; -static double libfunc(); +static double libfunc(char *fname, VARDEF *vp); #ifndef MAXLIB #define MAXLIB 64 /* maximum number of library functions */ @@ -255,6 +255,7 @@ badarg: eputs(actp->name); eputs(": argument not a function\n"); quit(1); + return NULL; /* pro forma return */ } @@ -386,7 +387,7 @@ l_select() /* return argument #(A1+1) */ { register int n; - n = argument(1) + .5; + n = (int)(argument(1) + .5); if (n == 0) return(nargum()-1); if (n < 1 || n > nargum()-1) {