diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2016-03-07 22:03:57 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2016-03-07 22:03:57 (GMT) |
| commit | 2c36685010638e6bfcdd4ec74194cd200081668b (patch) | |
| tree | 2f8a2d904c2bdcfeccf97f17f9ea2cec5f9ada52 /src/H5public.h | |
| parent | b99b5d494e4aa86901d7a68d4a31de96d11c83c7 (diff) | |
| download | hdf5-2c36685010638e6bfcdd4ec74194cd200081668b.zip hdf5-2c36685010638e6bfcdd4ec74194cd200081668b.tar.gz hdf5-2c36685010638e6bfcdd4ec74194cd200081668b.tar.bz2 | |
[svn-r29326] HDFFV-9536: Changed H5check_version() to use libtool shared library version numbers instead of the library version numbers.
bin/h5vers:
Changed to copy the shared lib version from lt_vers.am to H5public.h
(Thanks to Larry who made the changes.)
config/lt_vers.am:
cosmetic change, nothing material.
src/H5public.h:
Changed by bin/h5vers.
src/H5.c:
Changed H5check_version() to use shared library version for compatibility
checking.
test/tcheck_version.c:
test/testcheck_version.sh.in:
Changed to use shared library version numbers instead of the HDF5 library
version numbers for testing.
Tested: tested in Jam (C only), platypus and osx1010dev (enable fortran and C++).
Diffstat (limited to 'src/H5public.h')
| -rw-r--r-- | src/H5public.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/H5public.h b/src/H5public.h index 554ad26..3cfe42c 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -99,8 +99,12 @@ extern "C" { /* Empty string for real releases. */ #define H5_VERS_INFO "HDF5 library version: 1.9.234" /* Full version string */ -#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \ - H5_VERS_RELEASE) +/* LT Version numbers */ +#define LT_VERS_INTERFACE 6 +#define LT_VERS_AGE 0 +#define LT_VERS_REVISION 224 + +#define H5check() H5check_interface_compatibility(LT_VERS_INTERFACE, LT_VERS_AGE, LT_VERS_REVISION) /* macros for comparing the version */ #define H5_VERSION_GE(Maj,Min,Rel) \ @@ -343,8 +347,13 @@ H5_DLL herr_t H5set_free_list_limits (int reg_global_lim, int reg_list_lim, int blk_list_lim); H5_DLL herr_t H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum); +/* Deprecated by H5check_interface_compatibility. Need to keep it because + * Fortran API calls it. To be retired later. + */ H5_DLL herr_t H5check_version(unsigned majnum, unsigned minnum, - unsigned relnum); + unsigned relnum); +H5_DLL herr_t H5check_interface_compatibility(unsigned interface, unsigned age, \ + unsigned revision); H5_DLL herr_t H5is_library_threadsafe(hbool_t *is_ts); H5_DLL herr_t H5free_memory(void *mem); H5_DLL void *H5allocate_memory(size_t size, hbool_t clear); |