--- ray/src/hd/rholo.c 2003/06/13 15:27:04 3.56 +++ ray/src/hd/rholo.c 2003/06/21 14:48:54 3.58 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rholo.c,v 3.56 2003/06/13 15:27:04 greg Exp $"; +static const char RCSid[] = "$Id: rholo.c,v 3.58 2003/06/21 14:48:54 greg Exp $"; #endif /* * Radiance holodeck generation controller @@ -215,7 +215,7 @@ initrholo() /* get our holodeck running */ init_global(); /* record disk space limit */ if (!vdef(DISKSPACE)) - maxdisk = (1L<<(sizeof(off_t)*8-2)) - 1024; + maxdisk = ((off_t)1<<(sizeof(off_t)*8-2)) - 1024; else maxdisk = 1024.*1024.*vflt(DISKSPACE); /* set up memory cache */ @@ -413,7 +413,7 @@ creatholo(gp) /* create a holodeck output file */ HDGRID *gp; { extern char VersionID[]; - int4 lastloc, nextloc; + int32 lastloc, nextloc; int n; int fd; FILE *fp; @@ -479,7 +479,7 @@ loadholo() /* start loading a holodeck from fname */ FILE *fp; int fd; int n; - int4 nextloc; + int32 nextloc; if (ncprocs > 0 & force >= 0) fp = fopen(hdkfile, "r+");