[vlc-devel] [PATCH] stream_extractor: fix compilation with older libarchive

Steve Lhomme robux4 at videolabs.io
Thu Mar 2 16:50:08 CET 2017


Since we require only 3.1.0 instead of 3.2.2 in the contribs
---
 modules/stream_extractor/archive.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/stream_extractor/archive.c b/modules/stream_extractor/archive.c
index efdd4e4314..8d824fa5f3 100644
--- a/modules/stream_extractor/archive.c
+++ b/modules/stream_extractor/archive.c
@@ -124,7 +124,7 @@ static int libarchive_jump_cb( libarchive_t* p_arc, void* p_obj_current,
 }
 
 
-static la_int64_t libarchive_skip_cb( libarchive_t* p_arc, void* p_obj,
+static __LA_INT64_T libarchive_skip_cb( libarchive_t* p_arc, void* p_obj,
   off_t i_request )
 {
     VLC_UNUSED( p_arc );
@@ -148,8 +148,8 @@ static la_int64_t libarchive_skip_cb( libarchive_t* p_arc, void* p_obj,
     return  i_read >= 0 ? i_read : ARCHIVE_FATAL;
 }
 
-static la_int64_t libarchive_seek_cb( libarchive_t* p_arc, void* p_obj,
-  la_int64_t offset, int whence )
+static __LA_INT64_T libarchive_seek_cb( libarchive_t* p_arc, void* p_obj,
+  __LA_INT64_T offset, int whence )
 {
     VLC_UNUSED( p_arc );
 
@@ -173,7 +173,7 @@ static la_int64_t libarchive_seek_cb( libarchive_t* p_arc, void* p_obj,
     return vlc_stream_Tell( p_source );
 }
 
-static la_ssize_t libarchive_read_cb( libarchive_t* p_arc, void* p_obj,
+static __LA_SSIZE_T libarchive_read_cb( libarchive_t* p_arc, void* p_obj,
   const void** pp_dst )
 {
     VLC_UNUSED( p_arc );
-- 
2.11.1



More information about the vlc-devel mailing list