[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.

10 files changed, 23 insertions, 23 deletions

diff --git a/bin/make_vers b/bin/make_vers
index 07b6de6..74bb5d9 100755
--- a/bin/make_vers
+++ b/bin/make_vers
@@ -86,9 +86,9 @@ 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_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_NO_DEPRECATED_SYMBOLS) */\n";
+    print $fh "#endif /* (defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n";
 }
 
 ##############################################################################
diff --git a/configure b/configure
index c2472aa..8d85df4 100755
--- a/configure
+++ b/configure
@@ -51131,7 +51131,7 @@ echo "${ECHO_T}v16" >&6; }
     DEFAULT_API_VERSION=v16
 
 cat >>confdefs.h <<\_ACEOF
-#define USE_16_API 1
+#define USE_16_API_DEFAULT 1
 _ACEOF
 
 elif test "X$withval" = "Xv18"; then
diff --git a/configure.in b/configure.in
index d5abc9f..b72b5e4 100644
--- a/configure.in
+++ b/configure.in
@@ -3753,7 +3753,7 @@ AC_ARG_WITH([default-api-version],
 if test "X$withval" = "Xv16"; then
     AC_MSG_RESULT([v16])
     DEFAULT_API_VERSION=v16
-    AC_DEFINE([USE_16_API], [1],
+    AC_DEFINE([USE_16_API_DEFAULT], [1],
               [Define using v1.6 public API symbols by default])
 elif test "X$withval" = "Xv18"; then
     AC_MSG_RESULT([v18])
diff --git a/examples/testh5cc.sh.in b/examples/testh5cc.sh.in
index 940f363..ad9af80 100755
--- a/examples/testh5cc.sh.in
+++ b/examples/testh5cc.sh.in
@@ -134,7 +134,7 @@ main (void)
 
     printf("HDF5 C Sample program ran successfully. File %s generated.\n", H5FILE_NAME);
     remove(H5FILE_NAME);
- 
+
     return 0;
 }     
 EOF
diff --git a/src/H5E.c b/src/H5E.c
index 6eb7768..dbf79d2 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -170,13 +170,13 @@ H5E_set_default_auto(H5E_t *stk)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_set_default_auto)
 
-#ifdef H5_USE_16_API
+#if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)
     stk->auto_op.vers = 1;
     stk->auto_op.u.func1 = (H5E_auto1_t)H5Eprint1;
-#else /* H5_USE_16_API */
+#else /* H5_USE_16_API || H5_USE_16_API_DEFAULT */
     stk->auto_op.vers = 2;
     stk->auto_op.u.func2 = (H5E_auto2_t)H5Eprint2;
-#endif /* H5_USE_16_API */
+#endif /* H5_USE_16_API || H5_USE_16_API_DEFAULT */
     stk->auto_data = NULL;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5config.h.in b/src/H5config.h.in
index c4606c9..1436211 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -609,7 +609,7 @@
 #undef ULONG_TO_FP_BOTTOM_BIT_ACCURATE
 
 /* Define using v1.6 public API symbols by default */
-#undef USE_16_API
+#undef USE_16_API_DEFAULT
 
 /* Define if a memory checking tool will be used on the library, to cause
    library to be very picky about memory operations and also disable the
diff --git a/src/H5version.h b/src/H5version.h
index eab972c..c77a179 100644
--- a/src/H5version.h
+++ b/src/H5version.h
@@ -21,9 +21,9 @@
 #define _H5version_H
 
 /* Issue error if contradicting macros have been defined. */
-#if defined(H5_USE_16_API) && 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_NO_DEPRECATED_SYMBOLS) */
+#endif /* (defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)) && defined(H5_NO_DEPRECATED_SYMBOLS) */
 
 
 /* If a particular "global" version of the library's interfaces is chosen,
@@ -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
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..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 */
 
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index a6c87f7..80fe11f 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -630,7 +630,7 @@
 /* #undef H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE */
 
 /* Define using v1.6 public API symbols by default */
-/* #undef H5_USE_16_API */
+/* #undef H5_USE_16_API_DEFAULT */
 
 /* Define if a memory checking tool will be used on the library, to cause
    library to be very picky about memory operations and also disable the