diff options
author | Robb Matzke <matzke@llnl.gov> | 1999-02-25 15:40:27 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1999-02-25 15:40:27 (GMT) |
commit | 17535fbc174978ae71d916a02ee4dacee66a9d8c (patch) | |
tree | d3114488ba01370e6b21acca5915c4f771125713 /src/H5Flow.c | |
parent | d8b07ce1d025e3f4284c5038347097180fc2da11 (diff) | |
download | hdf5-17535fbc174978ae71d916a02ee4dacee66a9d8c.zip hdf5-17535fbc174978ae71d916a02ee4dacee66a9d8c.tar.gz hdf5-17535fbc174978ae71d916a02ee4dacee66a9d8c.tar.bz2 |
[svn-r1101] Changes since 19990219
----------------------
./config/irix64
The old (-32) compiler is now supported by setting envrionment
CC='cc -32'. The -64 compiler is the default or you can set
CC='cc -64'.
./src/H5A.c
./src/H5D.c
./src/H5F.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5G.c
./src/H5I.c
./src/H5Ocomp.c
./src/H5P.c
./src/H5R.c
./src/H5RA.c
./src/H5T.c
./src/H5Tbit.c
./src/H5Tconv.c
./src/H5Z.c
./src/H5detect.c
./test/big.c
./test/cmpd_dset.c
./test/dsets.c
./test/dtypes.c
./test/enum.c
./test/mtime.c
./test/ohdr.c
./tools/h5ls.c
Fixed lots of warnings on Irix64. Mailed a few remaining
warnings in H5S to Quincey and a few in the dumper to
Ruey-Hsia.
Diffstat (limited to 'src/H5Flow.c')
-rw-r--r-- | src/H5Flow.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5Flow.c b/src/H5Flow.c index cb518e6..2ec0897e 100644 --- a/src/H5Flow.c +++ b/src/H5Flow.c @@ -1033,8 +1033,10 @@ H5F_addr_pack(H5F_t __unused__ *f, haddr_t *addr, const unsigned long objno[2]) assert(objno); assert(addr); - addr->offset=objno[0]; - addr->offset|=((uint64_t)objno[1])<<(8*sizeof(long)); + addr->offset = objno[0]; +#if SIZEOF_LONG<SIZEOF_UINT64_T + addr->offset |= ((uint64_t)objno[1]) << (8*sizeof(long)); +#endif return(SUCCEED); } |