diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-27 17:10:28 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-27 17:10:28 (GMT) |
| commit | ab2de0d63c5b52af285b44daece19cbca6228f2f (patch) | |
| tree | 91104201b95c88b285e9a2afa5c6f094a1682ecf | |
| parent | cea73f9ff96e86752444cf3bd6f1bccf3bd42148 (diff) | |
| download | hdf5-ab2de0d63c5b52af285b44daece19cbca6228f2f.zip hdf5-ab2de0d63c5b52af285b44daece19cbca6228f2f.tar.gz hdf5-ab2de0d63c5b52af285b44daece19cbca6228f2f.tar.bz2 | |
[svn-r15968] Correct some minor syntax errors in the checkin #15943.
Tested with h5committest.
| -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 |