diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-23 19:48:45 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-23 19:48:45 (GMT) |
| commit | caa9e0c055f0837061d6586c55fd99fc596114fa (patch) | |
| tree | f813876722a3f7e3f6fd594fc28612b87ffb6d5d /test | |
| parent | b694ad6c877eda39822abf3af6f088ff55bfe9d7 (diff) | |
| download | hdf5-caa9e0c055f0837061d6586c55fd99fc596114fa.zip hdf5-caa9e0c055f0837061d6586c55fd99fc596114fa.tar.gz hdf5-caa9e0c055f0837061d6586c55fd99fc596114fa.tar.bz2 | |
[svn-r15936] Changed the library's macros H5_USE_16_API to H5_USE_16_API_DEFAULT avoid possible conflict with 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 'test')
| -rw-r--r-- | test/err_compat.c | 6 | ||||
| -rw-r--r-- | test/error_test.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/err_compat.c b/test/err_compat.c index 33c172f..a16d903 100644 --- a/test/err_compat.c +++ b/test/err_compat.c @@ -99,13 +99,13 @@ test_error(hid_t file) TEST_ERROR; if (!old_func) TEST_ERROR; -#ifdef H5_USE_16_API +#ifdef H5_USE_16_API_DEFAULT if (old_func != (H5E_auto1_t)H5Eprint1) TEST_ERROR; -#else /* H5_USE_16_API */ +#else /* H5_USE_16_API_DEFAULT */ if (old_func != (H5E_auto1_t)H5Eprint2) TEST_ERROR; -#endif /* H5_USE_16_API */ +#endif /* H5_USE_16_API_DEFAULT */ if(H5Eset_auto1(NULL, NULL)<0) TEST_ERROR; diff --git a/test/error_test.c b/test/error_test.c index 027f31b..f5857ba 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -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; |