diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-24 13:52:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-24 13:52:44 (GMT) |
| commit | 4b613cd706d292db2b96d9482331f277dfe8b0dd (patch) | |
| tree | 32671e24d23d917a97ad70af15acea91db812ee3 /Utilities | |
| parent | 56e242de240ab00c71cba279499a3bd17ba47362 (diff) | |
| parent | 20fec1520458cdfb71bf1099cfc3648154d57d8f (diff) | |
| download | CMake-4b613cd706d292db2b96d9482331f277dfe8b0dd.zip CMake-4b613cd706d292db2b96d9482331f277dfe8b0dd.tar.gz CMake-4b613cd706d292db2b96d9482331f277dfe8b0dd.tar.bz2 | |
Merge topic 'archive-error-handling'
20fec15204 cmArchiveWrite: Check for construction errors on Open
e2c06736e5 libarchive: Add missing cm3p prefixes on includes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6470
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c | 2 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c index 9489e51..bcb67fe 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #elif HAVE_BSDXML_H #include <bsdxml.h> #elif HAVE_EXPAT_H -#include <expat.h> +#include <cm3p/expat.h> #endif #ifdef HAVE_BZLIB_H #include <cm3p/bzlib.h> diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c index 4d71f98..62f98a4 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c +++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_zip.c @@ -53,10 +53,10 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_zip.c 201102 #include <cm3p/zlib.h> #endif #ifdef HAVE_BZLIB_H -#include <bzlib.h> +#include <cm3p/bzlib.h> #endif #ifdef HAVE_LZMA_H -#include <lzma.h> +#include <cm3p/lzma.h> #endif #include "archive.h" |