From eead56c4cf60637f9313e14f45838ded726bfd0a Mon Sep 17 00:00:00 2001 From: uyjulian Date: Sat, 27 May 2023 01:52:57 -0500 Subject: [PATCH] Rename to avoid arc4random_buf static definition clashing --- libarchive/archive_random.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libarchive/archive_random.c b/libarchive/archive_random.c index 9d1aa493f..4f573c41b 100644 --- a/libarchive/archive_random.c +++ b/libarchive/archive_random.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include #endif -static void arc4random_buf(void *, size_t); +static void la_arc4random_buf(void *, size_t); #endif /* HAVE_ARC4RANDOM_BUF */ @@ -92,6 +92,9 @@ archive_random(void *buf, size_t nbytes) } /* TODO: Does this case really happen? */ return ARCHIVE_FAILED; +#elif !defined(HAVE_ARC4RANDOM_BUF) && (!defined(_WIN32) || defined(__CYGWIN__)) + la_arc4random_buf(buf, nbytes); + return ARCHIVE_OK; #else arc4random_buf(buf, nbytes); return ARCHIVE_OK; @@ -256,7 +259,7 @@ arc4_getbyte(void) } static void -arc4random_buf(void *_buf, size_t n) +la_arc4random_buf(void *_buf, size_t n) { uint8_t *buf = (uint8_t *)_buf; _ARC4_LOCK(); -- 2.39.2