diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-17 13:11:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-17 13:11:06 (GMT) |
| commit | fe27c993ff18af1c02c2937b6474d021cc385293 (patch) | |
| tree | af246db08427ff8bd330b61f841df2e6d1c81fdf /Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c | |
| parent | 7a36a34a65351dc6a1cda622d129d3fcf1b28eeb (diff) | |
| parent | 67f5f0a9fd012f3da7cadf653102671a8f316718 (diff) | |
| download | CMake-fe27c993ff18af1c02c2937b6474d021cc385293.zip CMake-fe27c993ff18af1c02c2937b6474d021cc385293.tar.gz CMake-fe27c993ff18af1c02c2937b6474d021cc385293.tar.bz2 | |
Merge topic 'update-libarchive'
67f5f0a9 libarchive: Use _snprintf on Windows, not snprintf
fcfbb0a9 libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need it
61a649d9 libarchive: Update README-CMake.txt for new snapshot
4533560c Merge branch 'libarchive-upstream' into update-libarchive
44d6b82f libarchive: Disable all whitespace checks in third-party code
37f225b7 libarchive 3.1.2-246-ga5a5d28b (reduced)
6ab7c326 libarchive: Avoid left-shift overflow of signed integer
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c index b69c873..80389ee 100644 --- a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c +++ b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c @@ -2215,7 +2215,8 @@ _archive_write_disk_free(struct archive *_a) free(a->resource_fork); free(a->compressed_buffer); free(a->uncompressed_buffer); -#ifdef HAVE_ZLIB_H +#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_SYS_XATTR_H)\ + && defined(HAVE_ZLIB_H) if (a->stream_valid) { switch (deflateEnd(&a->stream)) { case Z_OK: |