diff options
author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-20 21:57:57 (GMT) |
---|---|---|
committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-20 21:57:57 (GMT) |
commit | d688fc55a94acc6bdf43607e5224bc28009ee5e8 (patch) | |
tree | e46dc5152aafe70254b02c330bcf5fa2ecf6d892 /src/H5Epkg.h | |
parent | d3d78bbd1be7dddd41b2a9f7e25ea42ce2192ddd (diff) | |
download | hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.zip hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.tar.gz hdf5-d688fc55a94acc6bdf43607e5224bc28009ee5e8.tar.bz2 |
[svn-r19441] Bug fix for 1707 - in a hurry, explain later.
tested on jam and amani, heiwa hasn't finished yet.
Diffstat (limited to 'src/H5Epkg.h')
-rw-r--r-- | src/H5Epkg.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/H5Epkg.h b/src/H5Epkg.h index a85ddc9..fc82502 100644 --- a/src/H5Epkg.h +++ b/src/H5Epkg.h @@ -69,13 +69,10 @@ /* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */ typedef struct { - 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; + unsigned vers; /* Which version callback to use */ + hbool_t user_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; /* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */ |