--- ray/src/gen/mkillum.c 2003/02/22 02:07:24 2.11 +++ ray/src/gen/mkillum.c 2003/06/27 22:27:45 2.15 @@ -1,16 +1,16 @@ #ifndef lint -static const char RCSid[] = "$Id: mkillum.c,v 2.11 2003/02/22 02:07:24 greg Exp $"; +static const char RCSid[] = "$Id: mkillum.c,v 2.15 2003/06/27 22:27:45 greg Exp $"; #endif /* * Make illum sources for optimizing rendering process */ -#include "mkillum.h" - #include - #include +#include "mkillum.h" +#include "platform.h" + /* default parameters */ #define SAMPDENS 48 /* points per projected steradian */ #define NSAMPS 32 /* samples per point */ @@ -136,7 +136,7 @@ int status; { int rtstat; - rtstat = close_process(rt.pd); + rtstat = close_process(&(rt.pd)); if (status == 0) if (rtstat < 0) error(WARNING, @@ -156,10 +156,12 @@ init() /* start rtrace and set up buffers */ ofun[OBJ_SPHERE].funp = o_sphere; ofun[OBJ_RING].funp = o_ring; /* set up signal handling */ +#ifdef SIGPIPE /* not present on Windows */ signal(SIGPIPE, quit); +#endif /* start rtrace process */ errno = 0; - maxbytes = open_process(rt.pd, rtargv); + maxbytes = open_process(&(rt.pd), rtargv); if (maxbytes == 0) { eputs(rtargv[0]); eputs(": command not found\n"); @@ -444,10 +446,10 @@ char *nm; if (fgetword(str, MAXSTR, fp) == NULL) goto readerr; /* is it an alias? */ - if (!strcmp(str, ALIASID)) { + if (!strcmp(str, ALIASKEY)) { if (fgetword(str, MAXSTR, fp) == NULL) goto readerr; - printf("\n%s %s %s", thisillum.altmat, ALIASID, str); + printf("\n%s %s %s", thisillum.altmat, ALIASKEY, str); if (fgetword(str, MAXSTR, fp) == NULL) goto readerr; printf("\t%s\n", str);