summaryrefslogtreecommitdiffstats
path: root/tools/h5jam/tellub.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2010-09-20 21:57:57 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2010-09-20 21:57:57 (GMT)
commitd688fc55a94acc6bdf43607e5224bc28009ee5e8 (patch)
treee46dc5152aafe70254b02c330bcf5fa2ecf6d892 /tools/h5jam/tellub.c
parentd3d78bbd1be7dddd41b2a9f7e25ea42ce2192ddd (diff)
downloadhdf5-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/tellub.c')
-rw-r--r--tools/h5jam/tellub.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index f1b6756..ba71712 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -129,7 +129,7 @@ main (int argc, const char *argv[])
{
char *ifname;
void *edata;
- H5E_auto2_t func;
+ H5E_auto_t func;
hid_t ifile;
hsize_t usize;
htri_t testval;
@@ -140,8 +140,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);