summaryrefslogtreecommitdiffstats
path: root/tools/h5ls
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/h5ls
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/h5ls')
-rw-r--r--tools/h5ls/h5ls.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index b1d9ee9..115a86c 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2417,7 +2417,11 @@ main(int argc, const char *argv[])
/* Turn off HDF5's automatic error printing unless you're debugging h5ls */
if(!show_errors_g)
- H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+#ifdef H5_USE_16_API_DEFAULT
+ H5Eset_auto(NULL, NULL);
+#else /* H5_USE_16_API_DEFAULT */
+ H5Eset_auto(H5E_DEFAULT, NULL, NULL);
+#endif /* H5_USE_16_API_DEFAULT */
/* Each remaining argument is an hdf5 file followed by an optional slash