diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2016-04-28 19:52:30 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2016-04-28 19:52:30 +0000 |
commit | 61901231e8a0c2e843e3489f0661cef460e7759f (patch) | |
tree | a321526d43b0886a8753b23e448e9cda443545b4 /french/med | |
parent | 97f35f56cf53664e299c24f650587594813ac99b (diff) |
Chase the latest hdf5 upgrade and unbreak.
Notes
Notes:
svn path=/head/; revision=414234
Diffstat (limited to 'french/med')
-rw-r--r-- | french/med/files/patch-include_2.3.6_med.h.in | 14 | ||||
-rw-r--r-- | french/med/files/patch-include_med.h.in | 15 | ||||
-rw-r--r-- | french/med/files/patch-src_2.3.6_ci_MEDequivInfo.c | 11 |
3 files changed, 40 insertions, 0 deletions
diff --git a/french/med/files/patch-include_2.3.6_med.h.in b/french/med/files/patch-include_2.3.6_med.h.in new file mode 100644 index 000000000000..2602df9f7b9d --- /dev/null +++ b/french/med/files/patch-include_2.3.6_med.h.in @@ -0,0 +1,14 @@ +--- include/2.3.6/med.h.in.orig 2014-10-09 08:12:57 UTC ++++ include/2.3.6/med.h.in +@@ -25,11 +25,7 @@ extern "C" { + #endif + + #define HDF5_VERSION (H5_VERS_MAJOR * 10000 + H5_VERS_MINOR * 100 + H5_VERS_RELEASE ) +-#if HDF5_VERSION < 10607 +-#define HDF5_SELECT_BUG (const hsize_t **) +-#else + #define HDF5_SELECT_BUG +-#endif + + + #define MED_NUM_MAJEUR 2 diff --git a/french/med/files/patch-include_med.h.in b/french/med/files/patch-include_med.h.in new file mode 100644 index 000000000000..c47a57c26967 --- /dev/null +++ b/french/med/files/patch-include_med.h.in @@ -0,0 +1,15 @@ +--- include/med.h.in.orig 2014-10-09 08:12:57 UTC ++++ include/med.h.in +@@ -27,12 +27,7 @@ extern "C" { + + #define HDF5_VERSION (H5_VERS_MAJOR * 10000 + H5_VERS_MINOR * 100 + H5_VERS_RELEASE ) + +-#if HDF5_VERSION < 10607 +-/*TODO : A enlever après MAJ complète api hdf5-1.8 */ +-#define HDF5_SELECT_BUG (const hsize_t **) +-#else + #define HDF5_SELECT_BUG +-#endif + + /*Le symbole H5F_LIBVER_18 n'existe pas dans hdf5-1.8.4 (uniquement à partir de la version 1.8.6) + Pour rester dans le modèle interne hdf introduit en 1.8 quelque soit les futurs modèles internes hdf diff --git a/french/med/files/patch-src_2.3.6_ci_MEDequivInfo.c b/french/med/files/patch-src_2.3.6_ci_MEDequivInfo.c new file mode 100644 index 000000000000..12006a1f3227 --- /dev/null +++ b/french/med/files/patch-src_2.3.6_ci_MEDequivInfo.c @@ -0,0 +1,11 @@ +--- src/2.3.6/ci/MEDequivInfo.c.orig 2014-10-09 08:12:59 UTC ++++ src/2.3.6/ci/MEDequivInfo.c +@@ -24,7 +24,7 @@ + #include <stdlib.h> + + int +-MEDequivInfo(int fid, char *maa, int ind, char *eq, char *des) ++MEDequivInfo(med_idt fid, char *maa, int ind, char *eq, char *des) + { + med_idt eqid; + med_err ret; |