diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-20 21:57:57 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-20 21:57:57 (GMT) |
| commit | d688fc55a94acc6bdf43607e5224bc28009ee5e8 (patch) | |
| tree | e46dc5152aafe70254b02c330bcf5fa2ecf6d892 /tools/h5jam/h5jam.c | |
| parent | d3d78bbd1be7dddd41b2a9f7e25ea42ce2192ddd (diff) | |
| download | hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.zip hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.tar.gz hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.tar.bz2 | |
[svn-r19441] Bug fix for 1707 - in a hurry, explain later.
tested on jam and amani, heiwa hasn't finished yet.
Diffstat (limited to 'tools/h5jam/h5jam.c')
| -rw-r--r-- | tools/h5jam/h5jam.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c index 17b1384..14d3f6a 100644 --- a/tools/h5jam/h5jam.c +++ b/tools/h5jam/h5jam.c @@ -166,7 +166,7 @@ main (int argc, const char *argv[]) int h5fid; int ofid; void *edata; - H5E_auto2_t func; + H5E_auto_t func; hid_t ifile; hid_t plist; herr_t status; @@ -185,8 +185,13 @@ main (int argc, const char *argv[]) h5tools_setstatus(EXIT_SUCCESS); /* Disable error reporting */ - H5Eget_auto2(H5E_DEFAULT, &func, &edata); - H5Eset_auto2(H5E_DEFAULT, NULL, NULL); +#ifdef H5_USE_16_API_DEFAULT + H5Eget_auto(&func, &edata); + H5Eset_auto(NULL, NULL); +#else /* H5_USE_16_API_DEFAULT */ + H5Eget_auto(H5E_DEFAULT, &func, &edata); + H5Eset_auto(H5E_DEFAULT, NULL, NULL); +#endif /* H5_USE_16_API_DEFAULT */ parse_command_line (argc, argv); |