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 | |
| 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')
| -rw-r--r-- | src/H5E.c | 6 | ||||
| -rw-r--r-- | src/H5config.h.in | 2 | ||||
| -rw-r--r-- | src/H5version.h | 8 |
3 files changed, 8 insertions, 8 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) diff --git a/src/H5config.h.in b/src/H5config.h.in index bc91f09..82a8c6d 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -606,7 +606,7 @@ #undef ULONG_TO_FP_BOTTOM_BIT_ACCURATE /* Define using v1.6 public API symbols by default */ -#undef USE_16_API +#undef USE_16_API_DEFAULT /* Define if a memory checking tool will be used on the library, to cause library to be very picky about memory operations and also disable the diff --git a/src/H5version.h b/src/H5version.h index eab972c..6f582f1 100644 --- a/src/H5version.h +++ b/src/H5version.h @@ -21,9 +21,9 @@ #define _H5version_H /* Issue error if contradicting macros have been defined. */ -#if defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) +#if (defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) #error "Can't choose old API versions when deprecated APIs are disabled" -#endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */ +#endif /* (defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */ /* If a particular "global" version of the library's interfaces is chosen, @@ -32,7 +32,7 @@ * Note: If an application has already chosen a particular version for an * API symbol, the individual API version macro takes priority. */ -#ifdef H5_USE_16_API +#if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT) /*************/ /* Functions */ @@ -130,7 +130,7 @@ #define H5E_auto_t_vers 1 #endif /* !defined(H5E_auto_t_vers) */ -#endif /* H5_USE_16_API */ +#endif /* H5_USE_16_API || H5_USE_16_API_DEFAULT */ /* Choose the correct version of each API symbol, defaulting to the latest |