diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-24 19:12:21 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-24 19:12:21 (GMT) |
| commit | 5deed723e5f626defd0f841bd304fbb2d052d9b1 (patch) | |
| tree | c13b7d0fb96fa614accd17d53932ca0c7d5bb77b /src/H5version.h | |
| parent | a66427462495807c39be4eb48d7015253b9e8853 (diff) | |
| download | hdf5-5deed723e5f626defd0f841bd304fbb2d052d9b1.zip hdf5-5deed723e5f626defd0f841bd304fbb2d052d9b1.tar.gz hdf5-5deed723e5f626defd0f841bd304fbb2d052d9b1.tar.bz2 | |
[svn-r15943] Changed the library's macros H5_USE_16_API to H5_USE_16_API_DEFAULT avoid possible conflict wi
th 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/H5version.h')
| -rw-r--r-- | src/H5version.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5version.h b/src/H5version.h index eab972c..c77a179 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 +#ifdef 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_DEFAULT */ /* Choose the correct version of each API symbol, defaulting to the latest |