Unbreak build on mingw.

SVN-Revision: 1971

13 files changed, 52 insertions, 0 deletions

diff --git a/libarchive/test/test_fuzz.c b/libarchive/test/test_fuzz.c
index 86b4d0ce..088bb9d9 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 8ac59467..003771df 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 6a967f05..a55527f8 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 15479c64..18af3b88 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 d8e520e4..3fc83d32 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 3c22fce1..ea798d74 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 f3fc9838..8e83736a 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 84b2e774..c20febdd 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 28c2bacd..b8cc2c14 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 da33e58a..5a64f46f 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 cd074044..a7c68e04 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 7d6ad4a7..009b5ecb 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 a4d96f86..5cc8e5df 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);