summaryrefslogtreecommitdiffstats
path: root/test/error_test.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2008-10-24 19:12:21 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2008-10-24 19:12:21 (GMT)
commit5deed723e5f626defd0f841bd304fbb2d052d9b1 (patch)
treec13b7d0fb96fa614accd17d53932ca0c7d5bb77b /test/error_test.c
parenta66427462495807c39be4eb48d7015253b9e8853 (diff)
downloadhdf5-5deed723e5f626defd0f841bd304fbb2d052d9b1.zip
hdf5-5deed723e5f626defd0f841bd304fbb2d052d9b1.tar.gz
hdf5-5deed723e5f626defd0f841bd304fbb2d052d9b1.tar.bz2
[svn-r15943] Changed the library's macros H5_USE_16_API to H5_USE_16_API_DEFAULT avoid possible conflict wi
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.
Diffstat (limited to 'test/error_test.c')
-rw-r--r--test/error_test.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/error_test.c b/test/error_test.c
index 027f31b..2ceb05f 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;
@@ -620,5 +620,5 @@ error:
printf("***** ERROR TEST FAILED! *****\n");
return 1;
}
-#endif /* H5_USE_16_API */
+#endif /* H5_USE_16_API_DEFAULT */