From: Christian Schmitz <support@monkeybreadsoftware.de>
Date: Sun, 13 Oct 2024 00:47:30 +0000 (+0200)
Subject: Update archive_private to avoid template keyword (#2342)
X-Git-Tag: v3.8.0~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8d7e074c16c7d0cac98e9236b299c0941edfd78;p=thirdparty%2Flibarchive.git

Update archive_private to avoid template keyword (#2342)

People really should never, ever, ever use libarchive internal headers.  And they definitely should not expect libarchive internal headers to work in a C++ compiler.  (C++ and C are really just not that compatible.)

However, people do a lot of things they shouldn't:  Avoid the reserved C++ keyword `template`
---

diff --git a/libarchive/archive_private.h b/libarchive/archive_private.h
index 5c5b5607a..050fc63c0 100644
--- a/libarchive/archive_private.h
+++ b/libarchive/archive_private.h
@@ -160,9 +160,9 @@ __LA_NORETURN void	__archive_errx(int retvalue, const char *msg);
 void	__archive_ensure_cloexec_flag(int fd);
 int	__archive_mktemp(const char *tmpdir);
 #if defined(_WIN32) && !defined(__CYGWIN__)
-int	__archive_mkstemp(wchar_t *template);
+int	__archive_mkstemp(wchar_t *templates);
 #else
-int	__archive_mkstemp(char *template);
+int	__archive_mkstemp(char *templates);
 #endif
 
 int	__archive_clean(struct archive *);