summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--h5public_extract.patch23
-rw-r--r--signature_conflict_fix.patch13
2 files changed, 0 insertions, 36 deletions
diff --git a/h5public_extract.patch b/h5public_extract.patch
deleted file mode 100644
index dacd0bcb9637..000000000000
--- a/h5public_extract.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -aur med-3.0.8_SRC.pristine/include/H5public_extract.h.in med-3.0.8_SRC.new/include/H5public_extract.h.in
---- med-3.0.8_SRC.pristine/include/H5public_extract.h.in 2015-03-05 11:12:31.668511247 -0500
-+++ med-3.0.8_SRC.new/include/H5public_extract.h.in 2015-03-05 11:22:20.159242461 -0500
-@@ -24,13 +24,15 @@
-
- //Extraction depuis H5public.h.
-
-+%{
- @HDF5_TYPEDEF_HERR_T@
- @HDF5_TYPEDEF_HID_T@
- @HDF5_TYPEDEF_HSIZE_T@
--
--#typedef int herr_t;
--#typedef int hid_t;
--#typedef unsigned long long hsize_t;
-+%}
-+
-+typedef int herr_t;
-+typedef int hid_t;
-+typedef unsigned long long hsize_t;
-
- #ifdef __cplusplus
- }
diff --git a/signature_conflict_fix.patch b/signature_conflict_fix.patch
deleted file mode 100644
index 8fa5d0f51718..000000000000
--- a/signature_conflict_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -aur med-3.1.0_SRC.pristine/src/2.3.6/ci/MEDequivInfo.c med-3.1.0_SRC.new/src/2.3.6/ci/MEDequivInfo.c
---- med-3.1.0_SRC.pristine/src/2.3.6/ci/MEDequivInfo.c 2016-05-08 12:24:29.143170143 -0400
-+++ med-3.1.0_SRC.new/src/2.3.6/ci/MEDequivInfo.c 2016-05-08 12:26:31.226111423 -0400
-@@ -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;
-