--- ray/src/hd/rholo2.c	1998/12/07 16:56:08	3.21
+++ ray/src/hd/rholo2.c	2003/06/30 14:59:12	3.24
@@ -1,9 +1,6 @@
-/* Copyright (c) 1998 Silicon Graphics, Inc. */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ SGI";
+static const char	RCSid[] = "$Id: rholo2.c,v 3.24 2003/06/30 14:59:12 schorsch Exp $";
 #endif
-
 /*
  * Rtrace support routines for holodeck rendering
  */
@@ -30,7 +27,7 @@ register struct gclim	*gcl;
 register HOLO	*hp;
 GCOORD	*gc;
 {
-	register FLOAT	*v;
+	register RREAL	*v;
 	register int	i;
 
 	if (hp != NULL) {
@@ -351,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