--- ray/src/rt/mx_func.c 2004/03/30 16:13:01 2.8 +++ ray/src/rt/mx_func.c 2024/12/03 19:36:58 2.10 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: mx_func.c,v 2.8 2004/03/30 16:13:01 schorsch Exp $"; +static const char RCSid[] = "$Id: mx_func.c,v 2.10 2024/12/03 19:36:58 greg Exp $"; #endif /* * mx_func.c - routine for mixture functions. @@ -26,17 +26,17 @@ static const char RCSid[] = "$Id: mx_func.c,v 2.8 2004 */ -extern int +int mx_func( /* compute mixture function */ - register OBJREC *m, + OBJREC *m, RAY *r ) { OBJECT obj; - register int i; + int i; double coef; OBJECT mod[2]; - register MFUNC *mf; + MFUNC *mf; if (m->oargs.nsargs < 4) objerror(m, USER, "bad # arguments"); @@ -53,7 +53,7 @@ mx_func( /* compute mixture function */ setfunc(m, r); errno = 0; coef = evalue(mf->ep[0]); - if (errno == EDOM || errno == ERANGE) { + if ((errno == EDOM) | (errno == ERANGE)) { objerror(m, WARNING, "compute error"); return(0); }