From: Shawn Webb Date: Sun, 9 Aug 2020 12:15:06 +0000 (-0400) Subject: HBSD: wrap function declaration in an ifdef to appease CI X-Git-Tag: v3.5.0~12^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9277468711badf44954c952abcf75c536164b2ca;p=thirdparty%2Flibarchive.git HBSD: wrap function declaration in an ifdef to appease CI The function I added only applies to FreeBSD. As such, if the function declaration isn't ifdef'd out for other architectures, continuous integration (CI) builds fail. Mitigate the failure by guarding the function declaration with the proper preprocessor macro conditional. Signed-off-by: Shawn Webb --- diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c index 876538189..7395ee725 100644 --- a/libarchive/archive_read_disk_entry_from_file.c +++ b/libarchive/archive_read_disk_entry_from_file.c @@ -103,8 +103,10 @@ __FBSDID("$FreeBSD"); static int setup_mac_metadata(struct archive_read_disk *, struct archive_entry *, int *fd); +#ifdef ARCHIVE_XATTR_FREEBSD static int setup_xattrs_namespace(struct archive_read_disk *, struct archive_entry *, int *, int); +#endif static int setup_xattrs(struct archive_read_disk *, struct archive_entry *, int *fd); static int setup_sparse(struct archive_read_disk *,