--- ray/src/hd/rhcopy.c 2010/09/26 15:39:10 3.25 +++ ray/src/hd/rhcopy.c 2011/05/20 02:06:39 3.27 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rhcopy.c,v 3.25 2010/09/26 15:39:10 greg Exp $"; +static const char RCSid[] = "$Id: rhcopy.c,v 3.27 2011/05/20 02:06:39 greg Exp $"; #endif /* * Copy data into a holodeck file @@ -134,7 +134,7 @@ openholo( /* open existing holodeck file for i/o */ FILE *fp; int fd; int hflags = 0; - int32 nextloc; + off_t nextloc; int n; /* open holodeck file */ if ((fp = fopen(fname, append ? "r+" : "r")) == NULL) { @@ -152,7 +152,7 @@ openholo( /* open existing holodeck file for i/o */ nextloc = ftell(fp); /* get stdio position */ fclose(fp); /* done with stdio */ for (n = 0; nextloc > 0L; n++) { /* initialize each section */ - lseek(fd, (off_t)nextloc, SEEK_SET); + lseek(fd, nextloc, SEEK_SET); read(fd, (char *)&nextloc, sizeof(nextloc)); hdinit(fd, NULL)->priv = hflags&H_OBST ? &obstr : hflags&H_OBSF ? &unobstr : (char *)NULL; @@ -176,7 +176,7 @@ addray( /* add a ray to our output holodeck */ int sn, bi, n; register HOLO *hp; GCOORD gc[2]; - BYTE rr[2][2]; + uby8 rr[2][2]; BEAM *bp; double d0, d1; unsigned dc;