From 677384017a343f1ca70342951a39302a683843a2 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 26 Jul 2013 16:22:48 -0400
Subject: [PATCH] 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.
---
 .../cmlibarchive/libarchive/archive_read_support_filter_lzop.c  | 2 +-
 Utilities/cmlibarchive/libarchive/archive_write_disk_posix.c    | 2 +-
 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 713af31e9..7958fa50a 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 bbd50a637..b69c8739d 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