diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-02-27 20:07:37 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-02-27 20:07:37 (GMT) |
commit | 0b4d32bb4a12fe0e34026c0f069aa99bf34cd834 (patch) | |
tree | 78bda62db83274079ca09e0d6bb4554dafa25544 /src/H5Fprivate.h | |
parent | ed6d456f28862192e5768c279d96ca6da5d0f6cb (diff) | |
download | hdf5-0b4d32bb4a12fe0e34026c0f069aa99bf34cd834.zip hdf5-0b4d32bb4a12fe0e34026c0f069aa99bf34cd834.tar.gz hdf5-0b4d32bb4a12fe0e34026c0f069aa99bf34cd834.tar.bz2 |
[svn-r301] Changes since 19980226
----------------------
./bin/release
Changed default to not tag CVS sources.
./src/H5F.c
Replaced a constant switch with preprocessor directives.
Removed a local variable which was set but not used.
./src/H5Fprivate.h
Changed `long long' to `int64' to get rid of ansi warnings in
a few places.
Fixed bugs in INT64DECODE() and UINT64DECODE() for big-endian
architectures. This fixes all the bugs with the Irix -64
compile.
./src/H5F.c
The default address and length sizes are set according to the
sizeof(size_t) now that the bugs have been fixed.
./src/H5Fpublic.h
Removed a trailing comma in an enumerated type.
./src/H5Fstdio.c
./src/H5Fsec2.c
Added two more calls to fseek64() and lseek64(). Removed `long
long' in place of `int64' to suppress -ansi warnings.
./src/H5P.c
Replaced a FAIL with H5F_LOW_ERROR.
./src/H5private.h
./configure.in
Increased version number to hdf5-1.0.1a since we've already
released hdf5-1.0.0a. Include <sys/types.h>. Fixed
indentation. Fixed detection of off64_t for old Irix systems
where it might be a struct.
./src/Makefile.in
Moved a comment from the shell to the makefile since some
versions of sh barf on interactive comments.
./config/linux
Allow overriding of the CC variable from the command-line. It
still defaults to gcc but this allows us to specify a complete
path from test scripts by saying:
CC=/usr/local/tools/gnu/gcc sh configure
Diffstat (limited to 'src/H5Fprivate.h')
-rw-r--r-- | src/H5Fprivate.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 0bee571..7a9e593 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -143,10 +143,10 @@ # define INT64DECODE(p, n) { \ /* WE DON'T CHECK FOR OVERFLOW! */ \ size_t _i; \ - n = 0; \ + n = 0; \ (p) += 8; \ - for (_i=0; _i<sizeof(int64); _i++, n<<=8) { \ - n |= *(--p); \ + for (_i=0; _i<sizeof(int64); _i++) { \ + n = (n<<8) | *(--p); \ } \ (p) += 8; \ } @@ -154,10 +154,10 @@ # define UINT64DECODE(p, n) { \ /* WE DON'T CHECK FOR OVERFLOW! */ \ size_t _i; \ - n = 0; \ + n = 0; \ (p) += 8; \ - for (_i=0; _i<sizeof(uint64); _i++, n<<=8) { \ - n |= *(--p); \ + for (_i=0; _i<sizeof(uint64); _i++) { \ + n = (n<<8) | *(--p); \ } \ (p) += 8; \ } @@ -339,7 +339,7 @@ typedef struct H5F_low_t { FILE *f; /* Posix stdio file */ H5F_fileop_t op; /* Previous file operation */ #ifdef HAVE_FSEEK64 - long long cur; /* Current file position */ + int64 cur; /* Current file position */ #else off_t cur; /* Current file position */ #endif |