--- ray/src/hd/holo.h 1997/12/18 14:45:59 3.9 +++ ray/src/hd/holo.h 1998/01/01 10:12:24 3.11 @@ -18,7 +18,7 @@ #define int2 short #endif #ifndef int4 -#define int4 long +#define int4 int #endif #define DCINF (unsigned)((1L<<16)-1) /* special value for infinity */ @@ -117,7 +117,7 @@ extern float hd_depthmap[]; /* depth conversion map * #define HOLOFMT "Holodeck" /* file format identifier */ #define HOLOVERS 0 /* file format version number */ -#define HOLOMAGIC (327+HOLOVERS) /* file magic number */ +#define HOLOMAGIC (323+sizeof(long)+8*HOLOVERS) /* file magic number */ /* * A holodeck file consists of an information header terminated by a