summaryrefslogtreecommitdiffstats
path: root/src/H5.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2010-09-27 17:53:37 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2010-09-27 17:53:37 (GMT)
commitbb87e6bac6a2d31ab70792eee8ca065860a979f6 (patch)
tree3e97bbfd0ab686c6e09c2e69e4b31116d320f79b /src/H5.c
parent84540ce6d1708e98c152276f524c938435da804c (diff)
downloadhdf5-bb87e6bac6a2d31ab70792eee8ca065860a979f6.zip
hdf5-bb87e6bac6a2d31ab70792eee8ca065860a979f6.tar.gz
hdf5-bb87e6bac6a2d31ab70792eee8ca065860a979f6.tar.bz2
[svn-r19479] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19466.
Bug 1707 is that H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with the 1.8 library to compile. Tested on jam - backing out, simple.
Diffstat (limited to 'src/H5.c')
-rw-r--r--src/H5.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/H5.c b/src/H5.c
index ca4402b..045c65b 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -210,7 +210,7 @@ H5_term_library(void)
int pending, ntries = 0, n;
size_t at = 0;
char loop[1024];
- H5E_auto_t func;
+ H5E_auto2_t func;
#ifdef H5_HAVE_THREADSAFE
/* explicit locking of the API */
@@ -223,11 +223,8 @@ H5_term_library(void)
goto done;
/* Check if we should display error output */
-#ifdef H5_USE_16_API_DEFAULT
- (void)H5Eget_auto(&func, NULL);
-#else
- (void)H5Eget_auto(H5E_DEFAULT, &func, NULL);
-#endif
+ (void)H5Eget_auto2(H5E_DEFAULT, &func, NULL);
+
/*
* Terminate each interface. The termination functions return a positive
* value if they do something that might affect some other interface in a