diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2007-01-05 10:48:18 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2007-01-05 10:48:18 +0000 |
| commit | a0b84e7498933faae16f2f43a2a29a72c1850165 (patch) | |
| tree | a8fbd9a8f7d676f70ed6b0db08db229718f48ade /lib/libarchive/archive_read_open_memory.c | |
| parent | 03d0aa10bc4524c28846bd828f1599420e4a195f (diff) | |
Notes
Diffstat (limited to 'lib/libarchive/archive_read_open_memory.c')
| -rw-r--r-- | lib/libarchive/archive_read_open_memory.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/libarchive/archive_read_open_memory.c b/lib/libarchive/archive_read_open_memory.c index a639d85de655..01975cf04f3b 100644 --- a/lib/libarchive/archive_read_open_memory.c +++ b/lib/libarchive/archive_read_open_memory.c @@ -48,7 +48,11 @@ 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 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); +#endif static ssize_t memory_read(struct archive *, void *, const void **buff); int @@ -119,8 +123,13 @@ memory_read(struct archive *a, void *client_data, const void **buff) * necessary in order to better exercise internal code when used * as a test harness. */ +#if ARCHIVE_API_VERSION < 2 static ssize_t memory_read_skip(struct archive *a, void *client_data, size_t skip) +#else +static off_t +memory_read_skip(struct archive *a, void *client_data, off_t skip) +#endif { struct read_memory_data *mine = (struct read_memory_data *)client_data; |