From: Mostyn Bramley-Moore <mostyn@antipode.se>
Date: Tue, 12 Dec 2023 02:37:29 +0000 (+0100)
Subject: Add a couple of missing HAVE_PCRE2POSIX_H ifdefs (#2033)
X-Git-Tag: v3.7.3~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fee65801c4f7f2f117745a7843ea418e7d3be4fc;p=thirdparty%2Flibarchive.git

Add a couple of missing HAVE_PCRE2POSIX_H ifdefs (#2033)

Followup to #2031.
---

diff --git a/tar/bsdtar.h b/tar/bsdtar.h
index ee7884f46..b4d9157f3 100644
--- a/tar/bsdtar.h
+++ b/tar/bsdtar.h
@@ -209,7 +209,7 @@ void	tar_mode_x(struct bsdtar *bsdtar);
 __LA_NORETURN void	usage(void);
 int	yes(const char *fmt, ...) __LA_PRINTF(1, 2);
 
-#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H)
+#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H) || defined(HAVE_PCRE2POSIX_H)
 void	add_substitution(struct bsdtar *, const char *);
 int	apply_substitution(struct bsdtar *, const char *, char **, int, int);
 void	cleanup_substitution(struct bsdtar *);
diff --git a/tar/util.c b/tar/util.c
index ffcf8fe72..37c3a2323 100644
--- a/tar/util.c
+++ b/tar/util.c
@@ -470,7 +470,7 @@ edit_pathname(struct bsdtar *bsdtar, struct archive_entry *entry)
 	const char *original_name = name;
 	const char *hardlinkname = archive_entry_hardlink(entry);
 	const char *original_hardlinkname = hardlinkname;
-#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H)
+#if defined(HAVE_REGEX_H) || defined(HAVE_PCREPOSIX_H) || defined(HAVE_PCRE2POSIX_H)
 	char *subst_name;
 	int r;