diff options
Diffstat (limited to 'lib/libarchive/test/test_tar_large.c')
| -rw-r--r-- | lib/libarchive/test/test_tar_large.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libarchive/test/test_tar_large.c b/lib/libarchive/test/test_tar_large.c index 5ce3105..542603d 100644 --- a/lib/libarchive/test/test_tar_large.c +++ b/lib/libarchive/test/test_tar_large.c @@ -73,7 +73,7 @@ struct memdata { #define GB ((off_t)1024 * MB) #define TB ((off_t)1024 * GB) -#if ARCHIVE_API_VERSION < 2 +#if ARCHIVE_VERSION_NUMBER < 2000000 static ssize_t memory_read_skip(struct archive *, void *, size_t request); #else static off_t memory_read_skip(struct archive *, void *, off_t request); @@ -167,7 +167,7 @@ memory_read(struct archive *a, void *_private, const void **buff) } -#if ARCHIVE_API_VERSION < 2 +#if ARCHIVE_VERSION_NUMBER < 2000000 static ssize_t memory_read_skip(struct archive *a, void *private, size_t skip) { @@ -273,10 +273,10 @@ DEFINE_TEST(test_tar_large) /* Close out the archive. */ assertA(0 == archive_write_close(a)); -#if ARCHIVE_API_VERSION > 1 - assertA(0 == archive_write_finish(a)); -#else +#if ARCHIVE_VERSION_NUMBER < 2000000 archive_write_finish(a); +#else + assertA(0 == archive_write_finish(a)); #endif /* @@ -303,10 +303,10 @@ DEFINE_TEST(test_tar_large) /* Close out the archive. */ assertA(0 == archive_read_close(a)); -#if ARCHIVE_API_VERSION > 1 - assertA(0 == archive_read_finish(a)); -#else +#if ARCHIVE_VERSION_NUMBER < 2000000 archive_read_finish(a); +#else + assertA(0 == archive_read_finish(a)); #endif free(memdata.buff); |
