[vlc-commits] contrib:libarchive: fix type mismatch between declaration and definition

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Jul 19 08:46:02 2017 +0200| [8b7ec738fea0b89bdcf6d04c686afdd724d8014b] | committer: Jean-Baptiste Kempf

contrib:libarchive: fix type mismatch between declaration and definition

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8b7ec738fea0b89bdcf6d04c686afdd724d8014b
---

 contrib/src/libarchive/fix-types.patch | 29 +++++++++++++++++++++++++++++
 contrib/src/libarchive/rules.mak       |  1 +
 2 files changed, 30 insertions(+)

diff --git a/contrib/src/libarchive/fix-types.patch b/contrib/src/libarchive/fix-types.patch
new file mode 100644
index 0000000000..3285058337
--- /dev/null
+++ b/contrib/src/libarchive/fix-types.patch
@@ -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);
diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak
index 33af57d021..b0d949d7a8 100644
--- a/contrib/src/libarchive/rules.mak
+++ b/contrib/src/libarchive/rules.mak
@@ -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)