diff options
author | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-23 19:48:45 (GMT) |
---|---|---|
committer | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-23 19:48:45 (GMT) |
commit | caa9e0c055f0837061d6586c55fd99fc596114fa (patch) | |
tree | f813876722a3f7e3f6fd594fc28612b87ffb6d5d /src/H5E.c | |
parent | b694ad6c877eda39822abf3af6f088ff55bfe9d7 (diff) | |
download | hdf5-caa9e0c055f0837061d6586c55fd99fc596114fa.zip hdf5-caa9e0c055f0837061d6586c55fd99fc596114fa.tar.gz hdf5-caa9e0c055f0837061d6586c55fd99fc596114fa.tar.bz2 |
[svn-r15936] Changed the library's macros H5_USE_16_API to H5_USE_16_API_DEFAULT avoid possible conflict with user's definition of H5_USE_16_API. The H5_USE_16_API_DEFAULT is defined through
configure with the flag --with-default-api-version=v16.
Tested with h5committest.
Diffstat (limited to 'src/H5E.c')
-rw-r--r-- | src/H5E.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -170,13 +170,13 @@ H5E_set_default_auto(H5E_t *stk) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_set_default_auto) -#ifdef H5_USE_16_API +#if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT) stk->auto_op.vers = 1; stk->auto_op.u.func1 = (H5E_auto1_t)H5Eprint1; -#else /* H5_USE_16_API */ +#else /* H5_USE_16_API || H5_USE_16_API_DEFAULT */ stk->auto_op.vers = 2; stk->auto_op.u.func2 = (H5E_auto2_t)H5Eprint2; -#endif /* H5_USE_16_API */ +#endif /* H5_USE_16_API || H5_USE_16_API_DEFAULT */ stk->auto_data = NULL; FUNC_LEAVE_NOAPI(SUCCEED) |