summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-07-26 20:22:48 (GMT)
committerBrad King <brad.king@kitware.com>2013-07-31 12:19:58 (GMT)
commit677384017a343f1ca70342951a39302a683843a2 (patch)
tree28057b31bfe2319603bc6980062570601817482c /Utilities/cmlibarchive
parent8dc0a9f898710215bd29fa260f790a7051dbaab2 (diff)
downloadCMake-677384017a343f1ca70342951a39302a683843a2.zip
CMake-677384017a343f1ca70342951a39302a683843a2.tar.gz
CMake-677384017a343f1ca70342951a39302a683843a2.tar.bz2
libarchive: Include cm_zlib.h to get zlib used by CMake
Follow up change from commit ffa6faa4 (libarchive: Include cm_zlib.h to get zlib used by CMake, 2011-12-20) for new includes of zlib.h in updated libarchive.
Diffstat (limited to 'Utilities/cmlibarchive')
-rw-r--r--Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c2
-rw-r--r--Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c
index 713af31..7958fa5 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_lzop.c
@@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
#include <lzo/lzo1x.h>
#endif
#ifdef HAVE_ZLIB_H
-#include <zlib.h> /* for crc32 and adler32 */
+#include <cm_zlib.h> /* for crc32 and adler32 */
#endif
#include "archive.h"
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
index bbd50a6..b69c873 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c
@@ -119,7 +119,7 @@ __FBSDID("$FreeBSD$");
#endif
#ifdef HAVE_ZLIB_H
-#include <zlib.h>
+#include <cm_zlib.h>
#endif
/* TODO: Support Mac OS 'quarantine' feature. This is really just a