--- ray/src/hd/rhoptimize.c	2003/02/22 02:07:25	3.8
+++ ray/src/hd/rhoptimize.c	2003/06/13 15:27:04	3.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhoptimize.c,v 3.8 2003/02/22 02:07:25 greg Exp $";
+static const char	RCSid[] = "$Id: rhoptimize.c,v 3.11 2003/06/13 15:27:04 greg Exp $";
 #endif
 /*
  * Optimize holodeck for quick access.
@@ -67,11 +67,11 @@ char	*argv[];
 		lseek(hdfd[0], (off_t)nextipos, 0);
 		read(hdfd[0], (char *)&nextipos, sizeof(nextipos));
 					/* get output position; set last */
-		thisopos = lseek(hdfd[1], (off_t)0L, 2);
+		thisopos = lseek(hdfd[1], (off_t)0, 2);
 		if (lastopos > 0L) {
 			lseek(hdfd[1], (off_t)lastopos, 0);
 			write(hdfd[1], (char *)&thisopos, sizeof(thisopos));
-			lseek(hdfd[1], (off_t)0L, 2);
+			lseek(hdfd[1], (off_t)0, 2);
 		}
 		lastopos = thisopos;
 		thisopos = 0L;		/* write place holder */
@@ -172,7 +172,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);
 	return(pdif > 0L);
@@ -190,13 +190,13 @@ int	*bq, nb;
 	int	n;
 
 	beamdir = hp->bi;		/* sort based on file position */
-	qsort((char *)bq, nb, sizeof(*bq), bpcmp);
+	qsort((void *)bq, nb, sizeof(*bq), bpcmp);
 					/* transfer and free each beam */
 	for (i = 0; i < nb; i++) {
 		bp = hdgetbeam(hp, bq[i]);
 		DCHECK(bp==NULL, CONSISTENCY, "empty beam in xferclump");
 		n = dupchecking ? nuniq(hdbray(bp),bp->nrm) : bp->nrm;
-		bcopy((char *)hdbray(bp), (char *)hdnewrays(hout,bq[i],n),
+		bcopy((void *)hdbray(bp), (void *)hdnewrays(hout,bq[i],n),
 				n*sizeof(RAYVAL));
 		hdfreebeam(hp, bq[i]);
 	}