From f40faa6edb2c38e90bedd36148e6828806fa31b4 Mon Sep 17 00:00:00 2001 From: Michihiro NAKAJIMA Date: Wed, 24 Feb 2010 03:22:26 -0500 Subject: [PATCH] Unbreak build on mingw. SVN-Revision: 1971 --- cpio/cpio.c | 4 ++ libarchive/archive_read.c | 8 ++++ libarchive/archive_read_data_into_fd.c | 4 ++ libarchive/archive_read_extract.c | 4 ++ libarchive/archive_read_private.h | 12 ++++++ libarchive/archive_read_support_format_ar.c | 11 +++++ libarchive/archive_read_support_format_cpio.c | 11 +++++ .../archive_read_support_format_empty.c | 11 +++++ .../archive_read_support_format_iso9660.c | 23 +++++++++++ .../archive_read_support_format_mtree.c | 10 +++++ libarchive/archive_read_support_format_raw.c | 11 +++++ libarchive/archive_read_support_format_tar.c | 11 +++++ libarchive/archive_read_support_format_xar.c | 11 +++++ libarchive/archive_read_support_format_zip.c | 40 +++++++++++++++++++ libarchive/test/test_fuzz.c | 4 ++ .../test/test_read_format_gtar_sparse.c | 4 ++ .../test/test_read_format_iso_multi_extent.c | 4 ++ .../test/test_read_format_isojoliet_bz2.c | 4 ++ .../test/test_read_format_isojoliet_long.c | 4 ++ .../test/test_read_format_isojoliet_rr.c | 4 ++ libarchive/test/test_read_format_isorr_bz2.c | 4 ++ libarchive/test/test_read_format_isorr_ce.c | 4 ++ .../test/test_read_format_isorr_new_bz2.c | 4 ++ .../test/test_read_format_isorr_rr_moved.c | 4 ++ .../test/test_read_format_isozisofs_bz2.c | 4 ++ libarchive/test/test_read_format_xar.c | 4 ++ libarchive/test/test_read_format_zip.c | 4 ++ 27 files changed, 223 insertions(+) diff --git a/cpio/cpio.c b/cpio/cpio.c index c35b0fbff..ac2b4f21d 100644 --- a/cpio/cpio.c +++ b/cpio/cpio.c @@ -896,7 +896,11 @@ extract_data(struct archive *ar, struct archive *aw) int r; size_t size; const void *block; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif for (;;) { r = archive_read_data_block(ar, &block, &size, &offset); diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c index f9abc6663..26d3a6e40 100644 --- a/libarchive/archive_read.c +++ b/libarchive/archive_read.c @@ -676,7 +676,11 @@ archive_read_data_skip(struct archive *_a) int r; const void *buff; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif __archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA, "archive_read_data_skip"); @@ -879,7 +883,11 @@ __archive_read_register_format(struct archive_read *a, int (*bid)(struct archive_read *), int (*options)(struct archive_read *, const char *, const char *), int (*read_header)(struct archive_read *, struct archive_entry *), +#if ARCHIVE_VERSION_NUMBER < 3000000 int (*read_data)(struct archive_read *, const void **, size_t *, off_t *), +#else + int (*read_data)(struct archive_read *, const void **, size_t *, int64_t *), +#endif int (*read_data_skip)(struct archive_read *), int (*cleanup)(struct archive_read *)) { diff --git a/libarchive/archive_read_data_into_fd.c b/libarchive/archive_read_data_into_fd.c index 3aeef3bc2..1ede6c61e 100644 --- a/libarchive/archive_read_data_into_fd.c +++ b/libarchive/archive_read_data_into_fd.c @@ -52,7 +52,11 @@ archive_read_data_into_fd(struct archive *a, int fd) const void *buff; size_t size, bytes_to_write; ssize_t bytes_written, total_written; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif off_t output_offset; __archive_check_magic(a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_DATA, "archive_read_data_into_fd"); diff --git a/libarchive/archive_read_extract.c b/libarchive/archive_read_extract.c index b698916fe..e45729934 100644 --- a/libarchive/archive_read_extract.c +++ b/libarchive/archive_read_extract.c @@ -137,7 +137,11 @@ archive_read_extract_set_progress_callback(struct archive *_a, static int copy_data(struct archive *ar, struct archive *aw) { +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif const void *buff; struct extract *extract; size_t size; diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h index 53d9b6545..fd65aa7a2 100644 --- a/libarchive/archive_read_private.h +++ b/libarchive/archive_read_private.h @@ -136,7 +136,11 @@ struct archive_read { * data to client buffers, filling gaps with zero bytes. */ const char *read_data_block; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t read_data_offset; +#else + int64_t read_data_offset; +#endif off_t read_data_output_offset; size_t read_data_remaining; @@ -167,7 +171,11 @@ struct archive_read { int (*options)(struct archive_read *, const char *key, const char *value); int (*read_header)(struct archive_read *, struct archive_entry *); +#if ARCHIVE_VERSION_NUMBER < 3000000 int (*read_data)(struct archive_read *, const void **, size_t *, off_t *); +#else + int (*read_data)(struct archive_read *, const void **, size_t *, int64_t *); +#endif int (*read_data_skip)(struct archive_read *); int (*cleanup)(struct archive_read *); } formats[9]; @@ -186,7 +194,11 @@ int __archive_read_register_format(struct archive_read *a, int (*bid)(struct archive_read *), int (*options)(struct archive_read *, const char *, const char *), int (*read_header)(struct archive_read *, struct archive_entry *), +#if ARCHIVE_VERSION_NUMBER < 3000000 int (*read_data)(struct archive_read *, const void **, size_t *, off_t *), +#else + int (*read_data)(struct archive_read *, const void **, size_t *, int64_t *), +#endif int (*read_data_skip)(struct archive_read *), int (*cleanup)(struct archive_read *)); diff --git a/libarchive/archive_read_support_format_ar.c b/libarchive/archive_read_support_format_ar.c index 80c014a1f..cfbd4cae5 100644 --- a/libarchive/archive_read_support_format_ar.c +++ b/libarchive/archive_read_support_format_ar.c @@ -78,8 +78,13 @@ struct ar { static int archive_read_format_ar_bid(struct archive_read *a); static int archive_read_format_ar_cleanup(struct archive_read *a); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_ar_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset); +#else +static int archive_read_format_ar_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset); +#endif static int archive_read_format_ar_skip(struct archive_read *a); static int archive_read_format_ar_read_header(struct archive_read *a, struct archive_entry *e); @@ -434,9 +439,15 @@ ar_parse_common_header(struct ar *ar, struct archive_entry *entry, return (ARCHIVE_OK); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_ar_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +archive_read_format_ar_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { ssize_t bytes_read; struct ar *ar; diff --git a/libarchive/archive_read_support_format_cpio.c b/libarchive/archive_read_support_format_cpio.c index d4237d819..d0bc1d10e 100644 --- a/libarchive/archive_read_support_format_cpio.c +++ b/libarchive/archive_read_support_format_cpio.c @@ -142,8 +142,13 @@ static int64_t atol16(const char *, unsigned); static int64_t atol8(const char *, unsigned); static int archive_read_format_cpio_bid(struct archive_read *); static int archive_read_format_cpio_cleanup(struct archive_read *); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_cpio_read_data(struct archive_read *, const void **, size_t *, off_t *); +#else +static int archive_read_format_cpio_read_data(struct archive_read *, + const void **, size_t *, int64_t *); +#endif static int archive_read_format_cpio_read_header(struct archive_read *, struct archive_entry *); static int be4(const unsigned char *); @@ -314,9 +319,15 @@ archive_read_format_cpio_read_header(struct archive_read *a, return (r); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_cpio_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +archive_read_format_cpio_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { ssize_t bytes_read; struct cpio *cpio; diff --git a/libarchive/archive_read_support_format_empty.c b/libarchive/archive_read_support_format_empty.c index 518fdcb49..d19c766a6 100644 --- a/libarchive/archive_read_support_format_empty.c +++ b/libarchive/archive_read_support_format_empty.c @@ -32,8 +32,13 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_empty.c 1915 #include "archive_read_private.h" static int archive_read_format_empty_bid(struct archive_read *); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_empty_read_data(struct archive_read *, const void **, size_t *, off_t *); +#else +static int archive_read_format_empty_read_data(struct archive_read *, + const void **, size_t *, int64_t *); +#endif static int archive_read_format_empty_read_header(struct archive_read *, struct archive_entry *); int @@ -80,9 +85,15 @@ archive_read_format_empty_read_header(struct archive_read *a, return (ARCHIVE_EOF); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_empty_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +archive_read_format_empty_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { (void)a; /* UNUSED */ (void)buff; /* UNUSED */ diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c index 0c640c88e..c023befb9 100644 --- a/libarchive/archive_read_support_format_iso9660.c +++ b/libarchive/archive_read_support_format_iso9660.c @@ -358,8 +358,13 @@ static int archive_read_format_iso9660_bid(struct archive_read *); static int archive_read_format_iso9660_options(struct archive_read *, const char *, const char *); static int archive_read_format_iso9660_cleanup(struct archive_read *); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_iso9660_read_data(struct archive_read *, const void **, size_t *, off_t *); +#else +static int archive_read_format_iso9660_read_data(struct archive_read *, + const void **, size_t *, int64_t *); +#endif static int archive_read_format_iso9660_read_data_skip(struct archive_read *); static int archive_read_format_iso9660_read_header(struct archive_read *, struct archive_entry *); @@ -1335,9 +1340,15 @@ archive_read_format_iso9660_read_data_skip(struct archive_read *a) #ifdef HAVE_ZLIB_H +#if ARCHIVE_VERSION_NUMBER < 3000000 static int zisofs_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +zisofs_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { struct iso9660 *iso9660; struct zisofs *zisofs; @@ -1553,9 +1564,15 @@ next_data: #else /* HAVE_ZLIB_H */ +#if ARCHIVE_VERSION_NUMBER < 3000000 static int zisofs_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +zisofs_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { (void)buff;/* UNUSED */ @@ -1568,9 +1585,15 @@ zisofs_read_data(struct archive_read *a, #endif /* HAVE_ZLIB_H */ +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_iso9660_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +archive_read_format_iso9660_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { ssize_t bytes_read; struct iso9660 *iso9660; diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c index f83ebe533..f9d6ca896 100644 --- a/libarchive/archive_read_support_format_mtree.c +++ b/libarchive/archive_read_support_format_mtree.c @@ -110,8 +110,13 @@ static int parse_line(struct archive_read *, struct archive_entry *, struct mtree *, struct mtree_entry *, int *); static int parse_keyword(struct archive_read *, struct mtree *, struct archive_entry *, struct mtree_option *, int *); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset); +#else +static int read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset); +#endif static ssize_t readline(struct archive_read *, struct mtree *, char **, ssize_t); static int skip(struct archive_read *a); static int read_header(struct archive_read *, @@ -968,8 +973,13 @@ parse_keyword(struct archive_read *a, struct mtree *mtree, return (ARCHIVE_OK); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static int read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +read_data(struct archive_read *a, const void **buff, size_t *size, int64_t *offset) +#endif { size_t bytes_to_read; ssize_t bytes_read; diff --git a/libarchive/archive_read_support_format_raw.c b/libarchive/archive_read_support_format_raw.c index 7a8481bf2..f159a216f 100644 --- a/libarchive/archive_read_support_format_raw.c +++ b/libarchive/archive_read_support_format_raw.c @@ -45,8 +45,13 @@ struct raw_info { static int archive_read_format_raw_bid(struct archive_read *); static int archive_read_format_raw_cleanup(struct archive_read *); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_raw_read_data(struct archive_read *, const void **, size_t *, off_t *); +#else +static int archive_read_format_raw_read_data(struct archive_read *, + const void **, size_t *, int64_t *); +#endif static int archive_read_format_raw_read_data_skip(struct archive_read *); static int archive_read_format_raw_read_header(struct archive_read *, struct archive_entry *); @@ -116,9 +121,15 @@ archive_read_format_raw_read_header(struct archive_read *a, return (ARCHIVE_OK); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_raw_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +archive_read_format_raw_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { struct raw_info *info; ssize_t avail; diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c index 8d71fae18..7d45dbd30 100644 --- a/libarchive/archive_read_support_format_tar.c +++ b/libarchive/archive_read_support_format_tar.c @@ -206,8 +206,13 @@ static int header_gnutar(struct archive_read *, struct tar *, struct archive_entry *, const void *h); static int archive_read_format_tar_bid(struct archive_read *); static int archive_read_format_tar_cleanup(struct archive_read *); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_tar_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset); +#else +static int archive_read_format_tar_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset); +#endif static int archive_read_format_tar_skip(struct archive_read *a); static int archive_read_format_tar_read_header(struct archive_read *, struct archive_entry *); @@ -444,9 +449,15 @@ archive_read_format_tar_read_header(struct archive_read *a, return (r); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_tar_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +archive_read_format_tar_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { ssize_t bytes_read; struct tar *tar; diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c index b91497542..63d08b1ad 100644 --- a/libarchive/archive_read_support_format_xar.c +++ b/libarchive/archive_read_support_format_xar.c @@ -369,8 +369,13 @@ struct xmlattr_list { static int xar_bid(struct archive_read *); static int xar_read_header(struct archive_read *, struct archive_entry *); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int xar_read_data(struct archive_read *, const void **, size_t *, off_t *); +#else +static int xar_read_data(struct archive_read *, + const void **, size_t *, int64_t *); +#endif static int xar_read_data_skip(struct archive_read *); static int xar_cleanup(struct archive_read *); static int move_reading_point(struct archive_read *, uint64_t); @@ -751,9 +756,15 @@ xar_read_header(struct archive_read *a, struct archive_entry *entry) return (r); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static int xar_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +xar_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { struct xar *xar; size_t used; diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c index 5a85e7112..044d9de59 100644 --- a/libarchive/archive_read_support_format_zip.c +++ b/libarchive/archive_read_support_format_zip.c @@ -123,15 +123,27 @@ static const char *compression_names[] = { static int archive_read_format_zip_bid(struct archive_read *); static int archive_read_format_zip_cleanup(struct archive_read *); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_zip_read_data(struct archive_read *, const void **, size_t *, off_t *); +#else +static int archive_read_format_zip_read_data(struct archive_read *, + const void **, size_t *, int64_t *); +#endif static int archive_read_format_zip_read_data_skip(struct archive_read *a); static int archive_read_format_zip_read_header(struct archive_read *, struct archive_entry *); +#if ARCHIVE_VERSION_NUMBER < 3000000 static int zip_read_data_deflate(struct archive_read *a, const void **buff, size_t *size, off_t *offset); static int zip_read_data_none(struct archive_read *a, const void **buff, size_t *size, off_t *offset); +#else +static int zip_read_data_deflate(struct archive_read *a, const void **buff, + size_t *size, int64_t *offset); +static int zip_read_data_none(struct archive_read *a, const void **buff, + size_t *size, int64_t *offset); +#endif static int zip_read_file_header(struct archive_read *a, struct archive_entry *entry, struct zip *zip); static time_t zip_time(const char *); @@ -486,9 +498,15 @@ zip_time(const char *p) return mktime(&ts); } +#if ARCHIVE_VERSION_NUMBER < 3000000 static int archive_read_format_zip_read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +archive_read_format_zip_read_data(struct archive_read *a, + const void **buff, size_t *size, int64_t *offset) +#endif { int r; struct zip *zip; @@ -598,9 +616,15 @@ archive_read_format_zip_read_data(struct archive_read *a, * Returns ARCHIVE_OK if successful, ARCHIVE_FATAL otherwise, sets * zip->end_of_entry if it consumes all of the data. */ +#if ARCHIVE_VERSION_NUMBER < 3000000 static int zip_read_data_none(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +zip_read_data_none(struct archive_read *a, const void **buff, + size_t *size, int64_t *offset) +#endif { struct zip *zip; ssize_t bytes_avail; @@ -639,9 +663,15 @@ zip_read_data_none(struct archive_read *a, const void **buff, } #ifdef HAVE_ZLIB_H +#if ARCHIVE_VERSION_NUMBER < 3000000 static int zip_read_data_deflate(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +zip_read_data_deflate(struct archive_read *a, const void **buff, + size_t *size, int64_t *offset) +#endif { struct zip *zip; ssize_t bytes_avail; @@ -737,9 +767,15 @@ zip_read_data_deflate(struct archive_read *a, const void **buff, return (ARCHIVE_OK); } #else +#if ARCHIVE_VERSION_NUMBER < 3000000 static int zip_read_data_deflate(struct archive_read *a, const void **buff, size_t *size, off_t *offset) +#else +static int +zip_read_data_deflate(struct archive_read *a, const void **buff, + size_t *size, int64_t *offset) +#endif { *buff = NULL; *size = 0; @@ -769,7 +805,11 @@ archive_read_format_zip_read_data_skip(struct archive_read *a) */ if (zip->flags & ZIP_LENGTH_AT_END) { size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif int r; do { r = archive_read_format_zip_read_data(a, &buff, diff --git a/libarchive/test/test_fuzz.c b/libarchive/test/test_fuzz.c index 86b4d0ce1..088bb9d95 100644 --- a/libarchive/test/test_fuzz.c +++ b/libarchive/test/test_fuzz.c @@ -74,7 +74,11 @@ DEFINE_TEST(test_fuzz) { const void *blk; size_t blk_size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t blk_offset; +#else + int64_t blk_offset; +#endif int n; for (n = 0; files[n].name != NULL; ++n) { diff --git a/libarchive/test/test_read_format_gtar_sparse.c b/libarchive/test/test_read_format_gtar_sparse.c index 8ac594671..003771dff 100644 --- a/libarchive/test/test_read_format_gtar_sparse.c +++ b/libarchive/test/test_read_format_gtar_sparse.c @@ -27,7 +27,11 @@ __FBSDID("$FreeBSD: head/lib/libarchive/test/test_read_format_gtar_sparse.c 1893 struct contents { +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t o; +#else + int64_t o; +#endif size_t s; const char *d; }; diff --git a/libarchive/test/test_read_format_iso_multi_extent.c b/libarchive/test/test_read_format_iso_multi_extent.c index 6a967f058..a55527f8b 100644 --- a/libarchive/test/test_read_format_iso_multi_extent.c +++ b/libarchive/test/test_read_format_iso_multi_extent.c @@ -33,7 +33,11 @@ DEFINE_TEST(test_read_format_iso_multi_extent) struct archive *a; const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_isojoliet_bz2.c b/libarchive/test/test_read_format_isojoliet_bz2.c index 15479c640..18af3b88b 100644 --- a/libarchive/test/test_read_format_isojoliet_bz2.c +++ b/libarchive/test/test_read_format_isojoliet_bz2.c @@ -59,7 +59,11 @@ DEFINE_TEST(test_read_format_isojoliet_bz2) struct archive *a; const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif extract_reference_file(refname); assert((a = archive_read_new()) != NULL); diff --git a/libarchive/test/test_read_format_isojoliet_long.c b/libarchive/test/test_read_format_isojoliet_long.c index d8e520e4e..3fc83d329 100644 --- a/libarchive/test/test_read_format_isojoliet_long.c +++ b/libarchive/test/test_read_format_isojoliet_long.c @@ -64,7 +64,11 @@ DEFINE_TEST(test_read_format_isojoliet_long) struct archive *a; const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif int i; for (i = 0; i < 100; i++) diff --git a/libarchive/test/test_read_format_isojoliet_rr.c b/libarchive/test/test_read_format_isojoliet_rr.c index 3c22fce11..ea798d74f 100644 --- a/libarchive/test/test_read_format_isojoliet_rr.c +++ b/libarchive/test/test_read_format_isojoliet_rr.c @@ -62,7 +62,11 @@ DEFINE_TEST(test_read_format_isojoliet_rr) struct archive *a; const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif extract_reference_file(refname); assert((a = archive_read_new()) != NULL); diff --git a/libarchive/test/test_read_format_isorr_bz2.c b/libarchive/test/test_read_format_isorr_bz2.c index f3fc98382..8e83736aa 100644 --- a/libarchive/test/test_read_format_isorr_bz2.c +++ b/libarchive/test/test_read_format_isorr_bz2.c @@ -59,7 +59,11 @@ DEFINE_TEST(test_read_format_isorr_bz2) struct archive *a; const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_isorr_ce.c b/libarchive/test/test_read_format_isorr_ce.c index 84b2e7743..c20febdd3 100644 --- a/libarchive/test/test_read_format_isorr_ce.c +++ b/libarchive/test/test_read_format_isorr_ce.c @@ -92,7 +92,11 @@ DEFINE_TEST(test_read_format_isorr_ce) struct archive *a; const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif int i; mkpath(path1, 151); diff --git a/libarchive/test/test_read_format_isorr_new_bz2.c b/libarchive/test/test_read_format_isorr_new_bz2.c index 28c2bacdd..b8cc2c148 100644 --- a/libarchive/test/test_read_format_isorr_new_bz2.c +++ b/libarchive/test/test_read_format_isorr_new_bz2.c @@ -60,7 +60,11 @@ DEFINE_TEST(test_read_format_isorr_new_bz2) struct archive *a; const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_isorr_rr_moved.c b/libarchive/test/test_read_format_isorr_rr_moved.c index da33e58ac..5a64f46f9 100644 --- a/libarchive/test/test_read_format_isorr_rr_moved.c +++ b/libarchive/test/test_read_format_isorr_rr_moved.c @@ -65,7 +65,11 @@ DEFINE_TEST(test_read_format_isorr_rr_moved) struct archive *a; const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_isozisofs_bz2.c b/libarchive/test/test_read_format_isozisofs_bz2.c index cd0740449..a7c68e046 100644 --- a/libarchive/test/test_read_format_isozisofs_bz2.c +++ b/libarchive/test/test_read_format_isozisofs_bz2.c @@ -58,7 +58,11 @@ DEFINE_TEST(test_read_format_isozisofs_bz2) struct archive *a; const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif int i; extract_reference_file(refname); diff --git a/libarchive/test/test_read_format_xar.c b/libarchive/test/test_read_format_xar.c index 7d6ad4a70..009b5ecbe 100644 --- a/libarchive/test/test_read_format_xar.c +++ b/libarchive/test/test_read_format_xar.c @@ -83,7 +83,11 @@ static void verify0(struct archive *a, struct archive_entry *ae) { const void *p; size_t size; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t offset; +#else + int64_t offset; +#endif assert(archive_entry_filetype(ae) == AE_IFREG); assertEqualInt(archive_entry_mode(ae) & 0777, 0644); diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c index a4d96f868..5cc8e5dfc 100644 --- a/libarchive/test/test_read_format_zip.c +++ b/libarchive/test/test_read_format_zip.c @@ -39,7 +39,11 @@ DEFINE_TEST(test_read_format_zip) char *buff[128]; const void *pv; size_t s; +#if ARCHIVE_VERSION_NUMBER < 3000000 off_t o; +#else + int64_t o; +#endif int r; extract_reference_file(refname); -- 2.47.3