summarylogtreecommitdiffstats
path: root/signature_conflict_fix.patch
diff options
context:
space:
mode:
authorJoey Dumont2016-05-08 13:14:08 -0400
committerJoey Dumont2016-05-08 13:14:08 -0400
commit83761eb51df4275db493dc95f268678c0a24ed03 (patch)
treeee2c7962798ec278b5f3840ad22cda40bfc14a86 /signature_conflict_fix.patch
parenta5c1f243fd324f40f7800a8c118159d18f1f22cf (diff)
downloadaur-83761eb51df4275db493dc95f268678c0a24ed03.tar.gz
Fixed the signature conflict.
Diffstat (limited to 'signature_conflict_fix.patch')
-rw-r--r--signature_conflict_fix.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/signature_conflict_fix.patch b/signature_conflict_fix.patch
new file mode 100644
index 00000000000..8fa5d0f5171
--- /dev/null
+++ b/signature_conflict_fix.patch
@@ -0,0 +1,13 @@
+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;
+