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 /bin | |
| 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 'bin')
| -rwxr-xr-x | bin/make_vers | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/make_vers b/bin/make_vers index 07b6de6..74bb5d9 100755 --- a/bin/make_vers +++ b/bin/make_vers @@ -86,9 +86,9 @@ sub print_checkoptions ($) { # Print the option checking print $fh "\n/* Issue error if contradicting macros have been defined. */\n"; - print $fh "#if defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS)\n"; + print $fh "#if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS)\n"; print $fh "#error \"Can't choose old API versions when deprecated APIs are disabled\"\n"; - print $fh "#endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n"; + print $fh "#endif /* (defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n"; } ############################################################################## |