diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-30 20:55:14 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-07-30 20:55:14 (GMT) |
commit | 33ea1ada248725e4cce6316c503e5c760bcca49c (patch) | |
tree | 3fd7e951132e6aa9b7d241a418505d3ae6e33587 /tools/h5repack/h5repack_copy.c | |
parent | 3f701fda6528be0844afa2315c2a28357591349a (diff) | |
download | hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.zip hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.gz hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.bz2 |
[svn-r25496] Description:
Merge 64-bit ID changes from branch to trunk. (Plus a few minor cleanups
that aren't on the branch)
Tested on:
Mac OSX/64 10.9.4 (amazon) w/C++ & FORTRAN
(h5committested on branch already for a week)
Diffstat (limited to 'tools/h5repack/h5repack_copy.c')
-rw-r--r-- | tools/h5repack/h5repack_copy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 521b9bd..44bea47 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -39,7 +39,7 @@ #define CHECK_H5DRW_ERROR(_fun, _did, _mtid, _msid, _fsid, _pid, _buf) { \ H5E_BEGIN_TRY { \ if(_fun(_did, _mtid, _msid, _fsid, _pid, _buf) < 0) { \ - int _err_num = 0; \ + hid_t _err_num = 0; \ char _msg[80]; \ H5Ewalk2(H5E_DEFAULT, H5E_WALK_DOWNWARD, walk_error_callback, &_err_num); \ H5Eget_msg(_err_num, NULL, _msg, (size_t)80); \ |