diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 19:02:48 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 19:02:48 (GMT) |
| commit | 1c61b6fe13f6fd9c84c0407f02865568e0a7f638 (patch) | |
| tree | e294883e7a2d7de4ec264d9ea68392c3587ecea3 /src/H5.c | |
| parent | 82c6eab1814e1e06ef9472f6f4bbc8522064e0bc (diff) | |
| download | hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.zip hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.tar.gz hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.tar.bz2 | |
[svn-r19481] 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.
I created a branch off the trunk called set_auto to continue working on the problem.
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
@@ -214,7 +214,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 */ @@ -227,11 +227,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 |