contrib:libarchive: fix type mismatch between declaration and definition
authorSteve Lhomme <robUx4@videolabs.io>
Wed, 19 Jul 2017 06:46:02 +0000 (08:46 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 21 Jul 2017 15:52:35 +0000 (17:52 +0200)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
contrib/src/libarchive/fix-types.patch [new file with mode: 0644]
contrib/src/libarchive/rules.mak

diff --git a/contrib/src/libarchive/fix-types.patch b/contrib/src/libarchive/fix-types.patch
new file mode 100644 (file)
index 0000000..3285058
--- /dev/null
@@ -0,0 +1,29 @@
+--- libarchive/libarchive/archive_entry.c      2017-07-18 15:27:58.259298500 +0200
++++ libarchive/libarchive/archive_entry.c.types        2017-07-18 15:21:43.800236200 +0200
+@@ -348,7 +348,7 @@ archive_entry_devminor(struct archive_en
+               return minor(entry->ae_stat.aest_dev);
+ }
+-mode_t
++__LA_MODE_T
+ archive_entry_filetype(struct archive_entry *entry)
+ {
+       return (AE_IFMT & entry->acl.mode);
+@@ -520,7 +520,7 @@ archive_entry_ino64(struct archive_entry
+       return (entry->ae_stat.aest_ino);
+ }
+-mode_t
++__LA_MODE_T
+ archive_entry_mode(struct archive_entry *entry)
+ {
+       return (entry->acl.mode);
+@@ -593,7 +593,7 @@ _archive_entry_pathname_l(struct archive
+       return (archive_mstring_get_mbs_l(&entry->ae_pathname, p, len, sc));
+ }
+-mode_t
++__LA_MODE_T
+ archive_entry_perm(struct archive_entry *entry)
+ {
+       return (~AE_IFMT & entry->acl.mode);
index 33af57d..b0d949d 100644 (file)
@@ -24,6 +24,7 @@ ifdef HAVE_WINSTORE
        $(APPLY) $(SRC)/libarchive/no-windows-files.patch
        $(APPLY) $(SRC)/libarchive/winrt.patch
 endif
+       $(APPLY) $(SRC)/libarchive/fix-types.patch
        $(call pkg_static,"build/pkgconfig/libarchive.pc.in")
        $(MOVE)