--- ray/src/rt/rpict.c	2003/03/10 17:26:26	2.54
+++ ray/src/rt/rpict.c	2003/06/26 00:58:10	2.56
@@ -21,21 +21,22 @@ static const char RCSid[] = "$Id";
 #endif
 #endif
 
-extern time_t	time();
-
+#include  <time.h>
 #include  <signal.h>
 
+#include  "platform.h"
 #include  "view.h"
-
 #include  "random.h"
-
 #include  "paths.h"
 
+
 #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 */
@@ -108,7 +109,7 @@ int  hres, vres;			/* resolution for this frame */
 
 static VIEW	lastview;		/* the previous view input */
 
-extern char  *mktemp();
+extern char  *mktemp();  /* XXX should be in stdlib.h or unistd.h */
 
 void  report();
 
@@ -181,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
 }
@@ -289,9 +290,7 @@ char  *pout, *zout, *prvr;
 					"cannot open output file \"%s\"", fbuf);
 				error(SYSTEM, errmsg);
 			}
-#ifdef MSDOS
-			setmode(fileno(stdout), O_BINARY);
-#endif
+			SET_FILE_BINARY(stdout);
 			dupheader();
 		}
 		hres = hresolu; vres = vresolu; pa = pixaspect;
@@ -393,9 +392,7 @@ char  *zfile, *oldfile;
 			sprintf(errmsg, "cannot open z-file \"%s\"", zfile);
 			error(SYSTEM, errmsg);
 		}
-#ifdef MSDOS
-		setmode(zfd, O_BINARY);
-#endif
+		SET_FD_BINARY(zfd);
 		for (i = 0; i <= psample; i++) {
 			zbar[i] = (float *)malloc(hres*sizeof(float));
 			if (zbar[i] == NULL)
@@ -418,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);
@@ -447,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--) {
@@ -464,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;
@@ -491,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");
@@ -677,9 +678,7 @@ char  *oldfile;
 		error(WARNING, errmsg);
 		goto gotzip;
 	}
-#ifdef MSDOS
-	setmode(fileno(fp), O_BINARY);
-#endif
+	SET_FILE_BINARY(fp);
 				/* discard header */
 	getheader(fp, NULL, NULL);
 				/* get picture size */