diff options
author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 17:53:37 (GMT) |
---|---|---|
committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 17:53:37 (GMT) |
commit | bb87e6bac6a2d31ab70792eee8ca065860a979f6 (patch) | |
tree | 3e97bbfd0ab686c6e09c2e69e4b31116d320f79b /src/H5Epkg.h | |
parent | 84540ce6d1708e98c152276f524c938435da804c (diff) | |
download | hdf5-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/H5Epkg.h')
-rw-r--r-- | src/H5Epkg.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/H5Epkg.h b/src/H5Epkg.h index b9688d2..a85ddc9 100644 --- a/src/H5Epkg.h +++ b/src/H5Epkg.h @@ -68,20 +68,15 @@ /****************************/ /* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */ -#ifndef H5_NO_DEPRECATED_SYMBOLS -typedef struct { - unsigned vers; /* Which version callback to use */ - hbool_t user_set; /* If the printing function has been set. */ - H5E_auto1_t func1; /* Old-style callback, NO error stack param. */ - H5E_auto2_t func2; /* New-style callback, with error stack param. */ -} H5E_auto_op_t; -#else typedef struct { - unsigned vers; /* Which version callback to use */ - hbool_t user_set; /* If the printing function has been set. */ - H5E_auto_t func2; /* Only the new style callback function is available. */ + unsigned vers; /* Which version callback to use */ + union { +#ifndef H5_NO_DEPRECATED_SYMBOLS + H5E_auto1_t func1; /* Old-style callback, NO error stack param. */ +#endif /* H5_NO_DEPRECATED_SYMBOLS */ + H5E_auto2_t func2; /* New-style callback, with error stack param. */ + }u; } H5E_auto_op_t; -#endif /* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */ typedef struct { |