summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2008-10-24 19:12:21 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2008-10-24 19:12:21 (GMT)
commit5deed723e5f626defd0f841bd304fbb2d052d9b1 (patch)
treec13b7d0fb96fa614accd17d53932ca0c7d5bb77b /bin
parenta66427462495807c39be4eb48d7015253b9e8853 (diff)
downloadhdf5-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 'bin')
-rwxr-xr-xbin/make_vers4
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";
}
##############################################################################