From f6ccfb42a23c41712a3932247ea31750ccaed2f7 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Tue, 20 Dec 2011 20:06:33 +0000 Subject: Update libarchive, tar and cpio to version 2.8.5 The following additional vendor revisions are applied: Revision 3740: Use archive_clear_error() to clear the error markers. Obtained from: http://code.google.com/p/libarchive MFC after: 2 weeks --- lib/libarchive/archive_read_support_compression_bzip2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libarchive/archive_read_support_compression_bzip2.c') diff --git a/lib/libarchive/archive_read_support_compression_bzip2.c b/lib/libarchive/archive_read_support_compression_bzip2.c index fc419d4cab60..891742f653fd 100644 --- a/lib/libarchive/archive_read_support_compression_bzip2.c +++ b/lib/libarchive/archive_read_support_compression_bzip2.c @@ -350,4 +350,4 @@ bzip2_filter_close(struct archive_read_filter *self) return (ret); } -#endif /* HAVE_BZLIB_H */ +#endif /* HAVE_BZLIB_H && BZ_CONFIG_ERROR */ -- cgit v1.3