--- ray/src/util/rtcontrib.c 2005/09/13 22:58:22 1.25 +++ ray/src/util/rtcontrib.c 2005/09/20 17:05:11 1.27 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rtcontrib.c,v 1.25 2005/09/13 22:58:22 greg Exp $"; +static const char RCSid[] = "$Id: rtcontrib.c,v 1.27 2005/09/20 17:05:11 greg Exp $"; #endif /* * Gather rtrace output to compute contributions from particular sources @@ -330,12 +330,15 @@ main(int argc, char *argv[]) quit(0); } +#ifndef SIGALRM +#define SIGALRM SIGTERM +#endif /* kill persistent rtrace process */ static void killpersist(void) { FILE *fp = fopen(persistfn, "r"); - int pid; + RT_PID pid; if (fp == NULL) return; @@ -713,7 +716,7 @@ add_contrib(const char *modn) bn = (int)(evalue(mp->binv) + .5); if (bn <= 0) bn = 0; - else if (bn > mp->nbins) { /* new bin */ + else if (bn >= mp->nbins) { /* new bin */ mp = (MODCONT *)realloc(mp, sizeof(MODCONT) + bn*sizeof(DCOLOR)); if (mp == NULL)