summaryrefslogtreecommitdiffstats
path: root/lib/libarchive/archive_write_set_compression_bzip2.c
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2011-07-17 21:27:38 +0000
committermm <mm@FreeBSD.org>2011-07-17 21:27:38 +0000
commitaf1b78954b9a91ab8b481f90c8b8c3522f6ea0fa (patch)
tree56f3cd4886fe6a4096374e4acc635884f68227ee /lib/libarchive/archive_write_set_compression_bzip2.c
parent352be4e985c0df0cf92cf64d89515b0b32bd1bf4 (diff)
downloadFreeBSD-src-af1b78954b9a91ab8b481f90c8b8c3522f6ea0fa.zip
FreeBSD-src-af1b78954b9a91ab8b481f90c8b8c3522f6ea0fa.tar.gz
- Update libarchive to 2.8.4
- Add support for extracting xar and rpm archives - Add libarchive_fe subdir (common code for tar and cpio) Approved by: kientzle MFC after: 2 weeks
Diffstat (limited to 'lib/libarchive/archive_write_set_compression_bzip2.c')
-rw-r--r--lib/libarchive/archive_write_set_compression_bzip2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libarchive/archive_write_set_compression_bzip2.c b/lib/libarchive/archive_write_set_compression_bzip2.c
index c8b502e..a3ed307 100644
--- a/lib/libarchive/archive_write_set_compression_bzip2.c
+++ b/lib/libarchive/archive_write_set_compression_bzip2.c
@@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$");
#include "archive_private.h"
#include "archive_write_private.h"
-#ifndef HAVE_BZLIB_H
+#if !defined(HAVE_BZLIB_H) || !defined(BZ_CONFIG_ERROR)
int
archive_write_set_compression_bzip2(struct archive *a)
{
@@ -405,4 +405,4 @@ drive_compressor(struct archive_write *a, struct private_data *state, int finish
}
}
-#endif /* HAVE_BZLIB_H */
+#endif /* HAVE_BZLIB_H && BZ_CONFIG_ERROR */
OpenPOWER on IntegriCloud