--- ray/src/rt/rpict.c	2003/06/05 19:29:34	2.55
+++ ray/src/rt/rpict.c	2003/06/30 14:59:12	2.57
@@ -11,7 +11,7 @@ static const char RCSid[] = "$Id";
 
 #include  <sys/types.h>
 
-#ifndef NIX
+#ifndef NON_POSIX
 #ifdef BSD
 #include  <sys/time.h>
 #include  <sys/resource.h>
@@ -33,8 +33,10 @@ static const char RCSid[] = "$Id";
 #define	 RFTEMPLATE	"rfXXXXXX"
 
 #ifndef SIGCONT
+#ifdef SIGIO     /* XXX can we live without this? */
 #define SIGCONT		SIGIO
 #endif
+#endif
 
 CUBE  thescene;				/* our scene */
 OBJECT	nsceneobjs;			/* number of objects in our scene */
@@ -113,7 +115,7 @@ void  report();
 
 double	pixvalue();
 
-#ifdef NIX
+#ifdef RHAS_ACCESS
 #define  file_exists(f)	(access(f,F_OK)==0)
 #else
 #include  <sys/types.h>
@@ -135,7 +137,7 @@ int  code;
 {
 	if (code)			/* report status */
 		report();
-#ifndef NIX
+#ifndef NON_POSIX
 	headclean();			/* delete header file */
 	pfclean();			/* clean up persist files */
 #endif
@@ -143,7 +145,7 @@ int  code;
 }
 
 
-#ifndef NIX
+#ifndef NON_POSIX
 void
 report()		/* report progress */
 {
@@ -180,7 +182,7 @@ report()		/* report progress */
 			nrays, pctdone, u/3600., s/3600.,
 			(tlastrept-tstart)/3600., myhostname());
 	eputs(errmsg);
-#ifndef BSD
+#ifdef SIGCONT
 	signal(SIGCONT, report);
 #endif
 }
@@ -413,10 +415,10 @@ char  *zfile, *oldfile;
 	pctdone = 100.0*i/vres;
 	if (ralrm > 0)			/* report init stats */
 		report();
-#ifndef	 BSD
+#ifdef SIGCONT
 	else
-#endif
 	signal(SIGCONT, report);
+#endif
 	ypos = vres-1 - i;			/* initialize sampling */
 	if (directvis)
 		init_drawsources(psample);
@@ -442,7 +444,7 @@ char  *zfile, *oldfile;
 		if (directvis)				/* add bitty sources */
 			drawsources(scanbar, zbar, 0, hres, ypos, ystep);
 							/* write it out */
-#ifndef	 BSD
+#ifdef SIGCONT
 		signal(SIGCONT, SIG_IGN);	/* don't interrupt writes */
 #endif
 		for (i = ystep; i > 0; i--) {
@@ -459,13 +461,15 @@ char  *zfile, *oldfile;
 		pctdone = 100.0*(vres-1-ypos)/vres;
 		if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm)
 			report();
-#ifndef	 BSD
+#ifdef SIGCONT
 		else
 			signal(SIGCONT, report);
 #endif
 	}
 						/* clean up */
+#ifdef SIGCONT
 	signal(SIGCONT, SIG_IGN);
+#endif
 	if (zfd != -1 && write(zfd, (char *)zbar[0], hres*sizeof(float))
 				< hres*sizeof(float))
 		goto writerr;
@@ -486,7 +490,9 @@ alldone:
 	pctdone = 100.0;
 	if (ralrm > 0)
 		report();
+#ifdef SIGCONT
 	signal(SIGCONT, SIG_DFL);
+#endif
 	return;
 writerr:
 	error(SYSTEM, "write error in render");