philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[svn-r15943] Changed the library's macros H5_USE_16_API to H5_USE_16_API_DEFAULT avoid possible conflict wi

Browse Source 
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.
This commit is contained in:
Raymond Lu
2008-10-24 14:12:21 -05:00
parent a664274624
commit 5deed723e5
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/H5E.c
View File

@@ -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)

2
src/H5config.h.in
View File

@@ -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

8
src/H5version.h
View File

@@ -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