File matio-hdf5_110-support.patch of Package matio

Overview Repositories Revisions Requests Users Attributes Meta

File matio-hdf5_110-support.patch of Package matio (Revision 9e60584102d7bf467af1d20e6d297d40)

Currently displaying revision 9e60584102d7bf467af1d20e6d297d40 , Show latest

From e387271d20f902d4f65fa1352898f12a789b1161 Mon Sep 17 00:00:00 2001
From: tbeu <tc@tbeu.de>
Date: Wed, 3 Aug 2016 17:39:55 +0200
Subject: [PATCH] Update support for HDF5 v1.10

* No longer use deprecated (v1.8) function H5Rdereference1 but use function H5Rdereference2 (v1.10)
 * Update build note for HDF5 v1.10
 * See https://github.com/tbeu/matio/issues/37
---
 README.md   | 2 +-
 src/mat73.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7697d16..8f19ec3 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ To support compressed MAT files, zlib 1.2.3 or greater is required. The zlib sof
 Support for MAT file version 7.3 requires the HDF5 library. This library can be downloaded from https://www.hdfgroup.org/. Matio requires HDF5 version &ge; 1.8.x. Neither deprecated HDF5 1.6.x API functions nor HDF5 higher-level functions are called.
 
 * Building matio with HDF5 1.8.x requires configuration of HDF5 with default API version 1.8 (i.e. `--with-default-api-version=v18`).
-* Building matio with HDF5 1.10.x requires configuration of HDF5 with either default API version 1.10 (i.e. `--with-default-api-version=v110`) and enabled legacy API functions (i.e. `--enable-deprecated-symbols=yes`) or configuration of HDF5 with deprecated API version 1.8 (i.e. `--with-default-api-version=v18`).
+* Building matio with HDF5 1.10.x requires configuration of HDF5 with either default API version 1.10 (i.e. `--with-default-api-version=v110`) or with deprecated API version 1.8 (i.e. `--with-default-api-version=v18`).
 
 For Windows, the pre-compiled binaries can be used which also include a DLL of zlib to satisfy the zlib dependency.
 
diff --git a/src/mat73.c b/src/mat73.c
index 2f20177..beaf609 100644
--- a/src/mat73.c
+++ b/src/mat73.c
@@ -72,9 +72,11 @@ struct h5_read_group_info_iter_data {
 };
 
 #if defined(H5Rdereference)
-#define H5RDEREFERENCE H5Rdereference1
+/* HDF5 1.10.0 */
+#define H5RDEREFERENCE(obj_id, ref_type, _ref) H5Rdereference2((obj_id), H5P_DATASET_ACCESS_DEFAULT, (ref_type), (_ref))
 #else
-#define H5RDEREFERENCE H5Rdereference
+/* HDF5 prior to 1.10.0 */
+#define H5RDEREFERENCE(obj_id, ref_type, _ref) H5Rdereference((obj_id), (ref_type), (_ref))
 #endif
 
 /*===========================================================================

Places

File matio-hdf5_110-support.patch of Package matio (Revision 9e60584102d7bf467af1d20e6d297d40)

Places