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.
This commit is contained in:
parent
8dc0a9f898
commit
677384017a
|
@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$");
|
||||||
#include <lzo/lzo1x.h>
|
#include <lzo/lzo1x.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_ZLIB_H
|
#ifdef HAVE_ZLIB_H
|
||||||
#include <zlib.h> /* for crc32 and adler32 */
|
#include <cm_zlib.h> /* for crc32 and adler32 */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "archive.h"
|
#include "archive.h"
|
||||||
|
|
|
@ -119,7 +119,7 @@ __FBSDID("$FreeBSD$");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_ZLIB_H
|
#ifdef HAVE_ZLIB_H
|
||||||
#include <zlib.h>
|
#include <cm_zlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* TODO: Support Mac OS 'quarantine' feature. This is really just a
|
/* TODO: Support Mac OS 'quarantine' feature. This is really just a
|
||||||
|
|
Loading…
Reference in New Issue