Unbreak build on mingw.

SVN-Revision: 1971

diff --git a/cpio/cpio.c b/cpio/cpio.c
index c35b0fbffb0c5e53e46ee600a4120f6566dae527..ac2b4f21d4dfc49735ab0111c9334c7c3d681132 100644 (file)
--- 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 f9abc66634235943372e8087ca22d281e5d1e604..26d3a6e40994697a7ebfa5aa3022a38c60926954 100644 (file)
--- 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 3aeef3bc2da8cbd51c3120837c3021ca96fe3825..1ede6c61ee01d9a32451bbfd1d360cb41f8408c5 100644 (file)
--- 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 b698916fe0b3f84423c78f1a7db2204eeb50ff80..e45729934281d932cc41c5864ea230b4c8f15200 100644 (file)
--- 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 53d9b654555066a516bce1e077878f5cd320880c..fd65aa7a2c64e80694a8ef4868f45cbe4196af28 100644 (file)
--- 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 80c014a1fe4ab3e42164bb6d1638fe51ab769f35..cfbd4cae5aaffe660a519525d7c932141eec2fb1 100644 (file)
--- 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 d4237d819ff862ebcff20b3896f5fe36a4e3163f..d0bc1d10e2ca14a04687b1fb969ce532aa9f50a5 100644 (file)
--- 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 518fdcb4913f45fa528128e60f1ebec547dfca5e..d19c766a642847c3eb7cda1ab7ede2c29c9cedc1 100644 (file)
--- 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 0c640c88e86741227dc72aa47ceb9e9b34acd016..c023befb973d0711eefff76e874b005e36e60dd2 100644 (file)
--- 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 f83ebe533399a740696c30a4a639152fccf546cd..f9d6ca896e3f8ff6daded4a7b242a9fed4e5faa3 100644 (file)
--- 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 7a8481bf221f46570184751cb739129122961a70..f159a216f10cd361a07dd700bc35b23b373058e0 100644 (file)
--- 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 8d71fae183f50d49a7e57eee0caeaa8c9573c9a9..7d45dbd307ce3a744ec8f36fd1a446349e0e5848 100644 (file)
--- 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 b914975423d5c1848b56fa7095804c9f311ae259..63d08b1ad11180d4f3d1f24c21fa945822fca532 100644 (file)
--- 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 5a85e71125a11101c0cb23628d9fd60b894fb7e6..044d9de59628bea0fac198cd20657ece6a19b30a 100644 (file)
--- 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 86b4d0ce1aafea1b7c977a326eb157c873c43296..088bb9d95901db9cad5c1ffd0dfd796e495c7824 100644 (file)
--- 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 8ac5946712a2c8242806245917888547a7fd1155..003771dfff4465004c40caeb2324f869b0715caa 100644 (file)
--- 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 6a967f05894f55995f5e308e4686344eb413de31..a55527f8b145b55c436b2e94627681fb761ec007 100644 (file)
--- 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 15479c64090a2deec4bde032dc4835901751cd7b..18af3b88b28b0dc499775bc0b4554e2ed24ad885 100644 (file)
--- 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 d8e520e4e170f104b9b892deb53fd9b678848829..3fc83d3299ef4935f98e9cf6c388d3748462ef29 100644 (file)
--- 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 3c22fce117f38cd99ecedcd0ac6711f921c13646..ea798d74f4ae9b55f3c61144a40cce23177e6559 100644 (file)
--- 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 f3fc983825fdbde06d46ac80a17f3f055bdb905f..8e83736aa3a86ad5af77f485ed766435d93cc56a 100644 (file)
--- 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 84b2e7743989ed12ba56133d277d8c742436881a..c20febdd3815a76c9ee5effc26d238eb0bb184a9 100644 (file)
--- 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 28c2bacdd2115a24768650cc2e732f699fbce31f..b8cc2c148f925111c377094af80dfe91b64a4774 100644 (file)
--- 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 da33e58acfac5e3322bf323345a863b0fca74d0e..5a64f46f98f15f0f512a07db978ea6175faa6acf 100644 (file)
--- 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 cd07404490e72de354d689281b7d62949e4025df..a7c68e04607d908f28fc15a0034e6f996056b848 100644 (file)
--- 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 7d6ad4a7058a0e0ada292c72a97dab671c4015e6..009b5ecbe1e20893010105211cf3910eb251b039 100644 (file)
--- 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 a4d96f868adf5facc6a6ff15cbb2ec519f15234a..5cc8e5dfc09c70845f8592203e3222c35c14711b 100644 (file)
--- 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);