summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2008-10-30 20:49:08 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2008-10-30 20:49:08 (GMT)
commit528a7dd3b8ac56d61d0f82e9e90fe4ed361eebc6 (patch)
tree696e4b87a24d728a7cb164f30ad702234e15d4ab /src
parent7ed42940d3271e7d9ed268f8837fae6187155866 (diff)
downloadhdf5-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 'src')
-rw-r--r--src/H5E.c6
-rw-r--r--src/H5version.h8
2 files changed, 9 insertions, 5 deletions
diff --git a/src/H5E.c b/src/H5E.c
index dbf79d2..6eb7768 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)
-#if defined(H5_USE_16_API) || defined(H5_USE_16_API_DEFAULT)
+#ifdef H5_USE_16_API
stk->auto_op.vers = 1;
stk->auto_op.u.func1 = (H5E_auto1_t)H5Eprint1;
-#else /* H5_USE_16_API || H5_USE_16_API_DEFAULT */
+#else /* H5_USE_16_API */
stk->auto_op.vers = 2;
stk->auto_op.u.func2 = (H5E_auto2_t)H5Eprint2;
-#endif /* H5_USE_16_API || H5_USE_16_API_DEFAULT */
+#endif /* H5_USE_16_API */
stk->auto_data = NULL;
FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5version.h b/src/H5version.h
index 49a346f..fd9e780 100644
--- a/src/H5version.h
+++ b/src/H5version.h
@@ -32,7 +32,11 @@
* 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_DEFAULT
+#if defined(H5_USE_16_API_DEFAULT) && !defined(H5_USE_16_API)
+#define H5_USE_16_API 1
+#endif /* H5_USE_16_API_DEFAULT && !H5_USE_16_API */
+
+#ifdef H5_USE_16_API
/*************/
/* Functions */
@@ -130,7 +134,7 @@
#define H5E_auto_t_vers 1
#endif /* !defined(H5E_auto_t_vers) */
-#endif /* H5_USE_16_API_DEFAULT */
+#endif /* H5_USE_16_API */
/* Choose the correct version of each API symbol, defaulting to the latest