diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-02-24 17:59:14 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-02-24 17:59:14 (GMT) |
commit | 33a65add7db18a4efd2b34ac8261c2065820ebf9 (patch) | |
tree | 782730a42955d1a247fec9356c5d05f83cce4903 /tools/lib/h5tools.c | |
parent | e63f0baf7e3a8e36c19f52d7692b483b7440e5eb (diff) | |
download | hdf5-33a65add7db18a4efd2b34ac8261c2065820ebf9.zip hdf5-33a65add7db18a4efd2b34ac8261c2065820ebf9.tar.gz hdf5-33a65add7db18a4efd2b34ac8261c2065820ebf9.tar.bz2 |
[svn-r16514] Description:
Merge r16440:16500 from trunk into revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.6 (amazon) in debug mode
Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'tools/lib/h5tools.c')
-rw-r--r-- | tools/lib/h5tools.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 52d65fe..6032c02 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -1559,8 +1559,8 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem) size_t size; /* datum size */ float tempfloat; double tempdouble; - unsigned long_long tempullong; - long_long templlong; + unsigned long long tempullong; + long long templlong; unsigned long tempulong; long templong; unsigned int tempuint; @@ -1726,7 +1726,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem) } else if (H5Tequal(tid, H5T_NATIVE_LLONG)) { - memcpy(&templlong, mem, sizeof(long_long)); + memcpy(&templlong, mem, sizeof(long long)); #ifdef DEBUG_H5DUMP_BIN fprintf(stream, fmt_llong, templlong); #else @@ -1736,7 +1736,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem) } else if (H5Tequal(tid, H5T_NATIVE_ULLONG)) { - memcpy(&tempullong, mem, sizeof(unsigned long_long)); + memcpy(&tempullong, mem, sizeof(unsigned long long)); #ifdef DEBUG_H5DUMP_BIN fprintf(stream, fmt_ullong, tempullong); #else @@ -1768,7 +1768,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem) } else { - memcpy(&templlong, mem, sizeof(long_long)); + memcpy(&templlong, mem, sizeof(long long)); #ifdef DEBUG_H5DUMP_BIN fprintf(stream, fmt_llong, templlong); #else @@ -1801,7 +1801,7 @@ int render_bin_output(FILE *stream, hid_t tid, void *_mem) } else { - memcpy(&tempullong, mem, sizeof(unsigned long_long)); + memcpy(&tempullong, mem, sizeof(unsigned long long)); #ifdef DEBUG_H5DUMP_BIN fprintf(stream, fmt_ullong, tempullong); #else |