philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r15943] Changed the library's macros H5_USE_16_API to H5_USE_16_API_DEFAULT avoid possible conflict wi

Browse Source 
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.
This commit is contained in:
Raymond Lu
2008-10-24 14:12:21 -05:00
parent a664274624
commit 5deed723e5
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/error_test.c
View File

@@ -21,13 +21,13 @@
*/
#include "h5test.h"
#ifdef H5_USE_16_API
#ifdef H5_USE_16_API_DEFAULT
int main(void)
{
printf("Test skipped because backward compatbility with v1.6 is configured in\n");
return 0;
}
#else /* H5_USE_16_API */
#else /* H5_USE_16_API_DEFAULT */
const char *FILENAME[] = {
"errors",
@@ -129,13 +129,13 @@ test_error(hid_t file)
TEST_ERROR;
if(old_data != NULL)
TEST_ERROR;
#ifdef H5_USE_16_API
#ifdef H5_USE_16_API_DEFAULT
if (old_func != (H5E_auto_t)H5Eprint)
TEST_ERROR;
#else /* H5_USE_16_API */
#else /* H5_USE_16_API_DEFAULT */
if (old_func != (H5E_auto2_t)H5Eprint2)
TEST_ERROR;
#endif /* H5_USE_16_API */
#endif /* H5_USE_16_API_DEFAULT */
if(H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0)
TEST_ERROR;
@@ -620,5 +620,5 @@ error:
printf("***** ERROR TEST FAILED! *****\n");
return 1;
}
#endif /* H5_USE_16_API */
#endif /* H5_USE_16_API_DEFAULT */