diff options
| -rwxr-xr-x | bin/make_vers | 2 | ||||
| -rw-r--r-- | src/H5version.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/make_vers b/bin/make_vers index 74bb5d9..c67be8c 100755 --- a/bin/make_vers +++ b/bin/make_vers @@ -86,7 +86,7 @@ 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_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_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n"; } diff --git a/src/H5version.h b/src/H5version.h index 38b306d..c77a179 100644 --- a/src/H5version.h +++ b/src/H5version.h @@ -21,7 +21,7 @@ #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_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_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */ @@ -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 |