--- ray/src/hd/rhcopy.c	2003/02/22 02:07:24	3.15
+++ ray/src/hd/rhcopy.c	2003/07/21 22:30:18	3.18
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhcopy.c,v 3.15 2003/02/22 02:07:24 greg Exp $";
+static const char	RCSid[] = "$Id: rhcopy.c,v 3.18 2003/07/21 22:30:18 schorsch Exp $";
 #endif
 /*
  * Copy data into a holodeck file
@@ -107,7 +107,6 @@ openholo(fname, append)		/* open existing holodeck fil
 char	*fname;
 int	append;
 {
-	extern long	ftell();
 	FILE	*fp;
 	int	fd;
 	int	hflags = 0;
@@ -195,7 +194,7 @@ static int
 bpcmp(b1p, b2p)			/* compare beam positions on disk */
 int	*b1p, *b2p;
 {
-	register long	pdif = beamdir[*b1p].fo - beamdir[*b2p].fo;
+	register off_t	pdif = beamdir[*b1p].fo - beamdir[*b2p].fo;
 
 	if (pdif > 0L) return(1);
 	if (pdif < 0L) return(-1);
@@ -299,7 +298,7 @@ char	*pcf, *zbf;
 	int	eshft;
 	double	emult;
 	RESOLU	prs;
-	FLOAT	vl[2];
+	RREAL	vl[2];
 	FVECT	ro, rd;
 	double	aftd;
 	COLOR	ctmp;
@@ -315,7 +314,7 @@ char	*pcf, *zbf;
 		error(SYSTEM, pcf);
 	}
 				/* load picture header */
-	copystruct(&phd.vw, &stdview);
+	phd.vw = stdview;
 	phd.expos = 1.0;
 	phd.badfmt = phd.gotview = phd.altprims = 0;
 	if (getheader(pfp, picheadline, (char *)&phd) < 0 ||