summaryrefslogtreecommitdiffstats
path: root/tools/misc
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2010-09-21 16:46:38 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2010-09-21 16:46:38 (GMT)
commitd6c6a34a8f5876d21dee052c74426b0606b62d13 (patch)
tree67b0dddc97926eae54a6fd23a563a4e2296dabab /tools/misc
parentba71366f9867bd2d817abf6715a5445237023c6f (diff)
downloadhdf5-d6c6a34a8f5876d21dee052c74426b0606b62d13.zip
hdf5-d6c6a34a8f5876d21dee052c74426b0606b62d13.tar.gz
hdf5-d6c6a34a8f5876d21dee052c74426b0606b62d13.tar.bz2
[svn-r19457] Bug fix for 1707 - H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with the 1.8 library to compile. The cause is from the mismatch of H5Eprint1 and H5Eprint2 set
through H5Eset_auto. I changed the union in the structure H5E_auto_t. Another change is to make H5Eget_auto fail if H5Eset_auto is called to set the printing function. I'll write a document for it. Tested on heiwa, jam, and amani. The property change in configure.in, config, and Makefile.am came from the merge of the 1.8 library change.
Diffstat (limited to 'tools/misc')
-rw-r--r--tools/misc/h5mkgrp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index 09f23ef..6d8a869 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -216,7 +216,12 @@ main(int argc, const char *argv[])
h5tools_setstatus(EXIT_SUCCESS);
/* Disable the HDF5 library's error reporting */
- 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 */
+
/* Initialize h5tools lib */
h5tools_init();