From d28e827ceb8a7d2cd6113e1ab2c3c829789fff9b Mon Sep 17 00:00:00 2001 From: Michihiro NAKAJIMA Date: Thu, 14 Aug 2014 10:35:43 +0900 Subject: [PATCH] Fix build failure on FreeBSD 8.x. --- .../test/test_read_format_gtar_sparse_skip_entry.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libarchive/test/test_read_format_gtar_sparse_skip_entry.c b/libarchive/test/test_read_format_gtar_sparse_skip_entry.c index 813315b71..1caed21bc 100644 --- a/libarchive/test/test_read_format_gtar_sparse_skip_entry.c +++ b/libarchive/test/test_read_format_gtar_sparse_skip_entry.c @@ -25,6 +25,11 @@ #include "test.h" __FBSDID("$FreeBSD"); +#if defined(__BORLANDC__) || (defined(_MSC_VER) && _MSC_VER <= 1300) +# define LITERAL_LL(x) x##i64 +#else +# define LITERAL_LL(x) x##ll +#endif /* * To test skip a sparse file entry, this test does not read file data. */ @@ -47,7 +52,7 @@ DEFINE_TEST(test_read_format_gtar_sparse_skip_entry) /* Verify regular first file. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString("a", archive_entry_pathname(ae)); - assertEqualInt(10737418244, archive_entry_size(ae)); + assertEqualInt(LITERAL_LL(10737418244), archive_entry_size(ae)); assertEqualInt(archive_entry_is_encrypted(ae), 0); assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED); @@ -86,7 +91,7 @@ DEFINE_TEST(test_read_format_gtar_sparse_skip_entry) /* Verify regular first file. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); assertEqualString("a", archive_entry_pathname(ae)); - assertEqualInt(10737418244, archive_entry_size(ae)); + assertEqualInt(LITERAL_LL(10737418244), archive_entry_size(ae)); assertEqualInt(archive_entry_is_encrypted(ae), 0); assertEqualIntA(a, archive_read_has_encrypted_entries(a), ARCHIVE_READ_FORMAT_ENCRYPTION_UNSUPPORTED); -- 2.47.2