diff options
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 { |