From cea8049404760b716944da782355eee9b0d1d914 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 28 Oct 2008 18:43:50 -0500 Subject: [svn-r15983] Description: Remove redundant check for 1.6 default API. Tested on: Eyeballed - very trivial --- bin/make_vers | 4 ++-- src/H5version.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/make_vers b/bin/make_vers index c67be8c..07b6de6 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_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS)\n"; + print $fh "#if defined(H5_USE_16_API) && 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_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n"; + print $fh "#endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n"; } ############################################################################## diff --git a/src/H5version.h b/src/H5version.h index c77a179..49a346f 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_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) +#if defined(H5_USE_16_API) && 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_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */ +#endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */ /* If a particular "global" version of the library's interfaces is chosen, -- cgit v0.12