From 1acae99df2e162894c23f4dbc2bc7a8e94d1db49 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 28 Oct 2026 17:06:38 -0400
Subject: [PATCH] libarchive: Add cm3p prefixes on includes new to 3.8.10

---
 Utilities/cmlibarchive/libarchive/archive_crc32.c       | 2 +-
 Utilities/cmlibarchive/libarchive/archive_xml_private.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Utilities/cmlibarchive/libarchive/archive_crc32.c b/Utilities/cmlibarchive/libarchive/archive_crc32.c
index 0b00557849..f02df46cfd 100644
--- a/Utilities/cmlibarchive/libarchive/archive_crc32.c
+++ b/Utilities/cmlibarchive/libarchive/archive_crc32.c
@@ -27,7 +27,7 @@
 #include "archive_private.h"
 
 #if defined(HAVE_ZLIB_H)
-#include <zlib.h>
+#include <cm3p/zlib.h>
 #endif
 
 #if (defined(__aarch64__) || defined(_M_ARM64)) && \
diff --git a/Utilities/cmlibarchive/libarchive/archive_xml_private.h b/Utilities/cmlibarchive/libarchive/archive_xml_private.h
index bb20ec8766..551a63df77 100644
--- a/Utilities/cmlibarchive/libarchive/archive_xml_private.h
+++ b/Utilities/cmlibarchive/libarchive/archive_xml_private.h
@@ -55,7 +55,7 @@
 #define ARCHIVE_XML_READER_XMLLITE 1
 #define ARCHIVE_XML_USE_XMLLITE 1
 #elif HAVE_EXPAT_H && HAVE_LIBEXPAT
-#include <expat.h>
+#include <cm3p/expat.h>
 #define ARCHIVE_XML_READ 1
 #define ARCHIVE_XML_READER_EXPAT 1
 #define ARCHIVE_XML_USE_EXPAT 1