diff options
author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-23 20:40:49 (GMT) |
---|---|---|
committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-23 20:40:49 (GMT) |
commit | dd49fb904c957c9ff2bc55b2d6c62880d5decb30 (patch) | |
tree | 8cc675d40afb73093307897f7380b094a49b914b /src/H5.c | |
parent | 48e1b5fad6b0f2e09e3f2ec0237723bf9e415b14 (diff) | |
download | hdf5-dd49fb904c957c9ff2bc55b2d6c62880d5decb30.zip hdf5-dd49fb904c957c9ff2bc55b2d6c62880d5decb30.tar.gz hdf5-dd49fb904c957c9ff2bc55b2d6c62880d5decb30.tar.bz2 |
[svn-r19475] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19467.
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.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -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 |