diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-30 20:49:08 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2008-10-30 20:49:08 (GMT) |
| commit | 528a7dd3b8ac56d61d0f82e9e90fe4ed361eebc6 (patch) | |
| tree | 696e4b87a24d728a7cb164f30ad702234e15d4ab /test | |
| parent | 7ed42940d3271e7d9ed268f8837fae6187155866 (diff) | |
| download | hdf5-528a7dd3b8ac56d61d0f82e9e90fe4ed361eebc6.zip hdf5-528a7dd3b8ac56d61d0f82e9e90fe4ed361eebc6.tar.gz hdf5-528a7dd3b8ac56d61d0f82e9e90fe4ed361eebc6.tar.bz2 | |
[svn-r16006] Modify the commit of r15943 for H5_USE_16_API. Let H5version.h check if H5_USE_16_API_DEFAULT is defined by the configure. Then define H5_USE_16_API and use it throughout.
Tested on kagiso - supposed to be simple.
Diffstat (limited to 'test')
| -rw-r--r-- | test/err_compat.c | 6 | ||||
| -rw-r--r-- | test/error_test.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/err_compat.c b/test/err_compat.c index a16d903..33c172f 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_DEFAULT +#ifdef H5_USE_16_API if (old_func != (H5E_auto1_t)H5Eprint1) TEST_ERROR; -#else /* H5_USE_16_API_DEFAULT */ +#else /* H5_USE_16_API */ if (old_func != (H5E_auto1_t)H5Eprint2) TEST_ERROR; -#endif /* H5_USE_16_API_DEFAULT */ +#endif /* H5_USE_16_API */ if(H5Eset_auto1(NULL, NULL)<0) TEST_ERROR; diff --git a/test/error_test.c b/test/error_test.c index 2ceb05f..027f31b 100644 --- a/test/error_test.c +++ b/test/error_test.c @@ -21,13 +21,13 @@ */ #include "h5test.h" -#ifdef H5_USE_16_API_DEFAULT +#ifdef H5_USE_16_API int main(void) { printf("Test skipped because backward compatbility with v1.6 is configured in\n"); return 0; } -#else /* H5_USE_16_API_DEFAULT */ +#else /* H5_USE_16_API */ 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_DEFAULT +#ifdef H5_USE_16_API if (old_func != (H5E_auto_t)H5Eprint) TEST_ERROR; -#else /* H5_USE_16_API_DEFAULT */ +#else /* H5_USE_16_API */ if (old_func != (H5E_auto2_t)H5Eprint2) TEST_ERROR; -#endif /* H5_USE_16_API_DEFAULT */ +#endif /* H5_USE_16_API */ 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_DEFAULT */ +#endif /* H5_USE_16_API */ |