diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-22 17:21:16 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-22 17:21:16 (GMT) |
| commit | fdcf35c207405829edcd606d2bd5409dfda069fc (patch) | |
| tree | 1a027c065d212e5bdadc4ea601c92afe8ea297af /src/H5Epkg.h | |
| parent | 0c736e8d87291d3873f38787217871298a0aa407 (diff) | |
| download | hdf5-fdcf35c207405829edcd606d2bd5409dfda069fc.zip hdf5-fdcf35c207405829edcd606d2bd5409dfda069fc.tar.gz hdf5-fdcf35c207405829edcd606d2bd5409dfda069fc.tar.bz2 | |
[svn-r19467] Bug fix for 1707 - My previous checkin wasn't complete. I left out the case when the
deprecated symbols were disabled. I made a different definition for H5E_auto_op_t when the
deprecated symbols were disabled.
Tested on jam - a simple change.
There's no change to configure.in, Makefile.am, config, tools/lib, c++/test, and fortran. The
property change came from the merge from 1.8 branch.
Diffstat (limited to 'src/H5Epkg.h')
| -rw-r--r-- | src/H5Epkg.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/H5Epkg.h b/src/H5Epkg.h index fc82502..b9688d2 100644 --- a/src/H5Epkg.h +++ b/src/H5Epkg.h @@ -68,12 +68,20 @@ /****************************/ /* 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; + 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. */ +} H5E_auto_op_t; +#endif /* Some syntactic sugar to make the compiler happy with two different kinds of callbacks */ typedef struct { |