summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/test/read_open_memory.c
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2008-09-01 05:38:33 +0000
committerkientzle <kientzle@FreeBSD.org>2008-09-01 05:38:33 +0000
commitda7b4a0824397b1c724cdf9a9b03b642ef8610ae (patch)
tree33ffbad3b60850d7aaaa2e6c79990403e110b2c2 /lib/libarchive/test/read_open_memory.c
parent4f7f14505ade23cf1713dac8e039845e724b1326 (diff)
downloadFreeBSD-src-da7b4a0824397b1c724cdf9a9b03b642ef8610ae.zip
FreeBSD-src-da7b4a0824397b1c724cdf9a9b03b642ef8610ae.tar.gz
Style: Use ARCHIVE_VERSION_NUMBER to conditionalize tests on
the particular libarchive version being tested instead of the deprecated ARCHIVE_API_VERSION and ARCHIVE_VERSION_STAMP macros.
Diffstat (limited to 'lib/libarchive/test/read_open_memory.c')
-rw-r--r--lib/libarchive/test/read_open_memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libarchive/test/read_open_memory.c b/lib/libarchive/test/read_open_memory.c
index 63a7778..fac9b23 100644
--- a/lib/libarchive/test/read_open_memory.c
+++ b/lib/libarchive/test/read_open_memory.c
@@ -48,7 +48,7 @@ struct read_memory_data {
static int memory_read_close(struct archive *, void *);
static int memory_read_open(struct archive *, void *);
-#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);
@@ -113,7 +113,7 @@ memory_read(struct archive *a, void *client_data, const void **buff)
/*
* How mean can a skip() routine be? Let's try to find out.
*/
-#if ARCHIVE_API_VERSION < 2
+#if ARCHIVE_VERSION_NUMBER < 2000000
static ssize_t
memory_read_skip(struct archive *a, void *client_data, size_t skip)
#else
OpenPOWER on IntegriCloud