--- ray/src/hd/rholo2.c	2003/02/22 02:07:25	3.22
+++ ray/src/hd/rholo2.c	2003/07/07 17:21:51	3.25
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rholo2.c,v 3.22 2003/02/22 02:07:25 greg Exp $";
+static const char	RCSid[] = "$Id: rholo2.c,v 3.25 2003/07/07 17:21:51 greg Exp $";
 #endif
 /*
  * Rtrace support routines for holodeck rendering
@@ -27,7 +27,7 @@ register struct gclim	*gcl;
 register HOLO	*hp;
 GCOORD	*gc;
 {
-	register FLOAT	*v;
+	register RREAL	*v;
 	register int	i;
 
 	if (hp != NULL) {
@@ -277,7 +277,7 @@ done_rtrace()			/* clean up and close rtrace calculati
 	int	status;
 					/* already closed? */
 	if (!nprocs)
-		return;
+		return(0);
 					/* flush beam queue */
 	done_packets(flush_queue());
 					/* sync holodeck */
@@ -348,7 +348,7 @@ getradfile()			/* run rad and get needed variables */
 			pippt = NULL;
 		}
 	if (pippt != NULL)
-		strcpy(pippt, "> /dev/null");	/* nothing to match */
+		strcpy(pippt, "> " NULL_DEVICE);	/* nothing to match */
 	else
 		sprintf(cp, ")[ \t]*=' > %s", tf2);
 #ifdef DEBUG