From: uyjulian <uyjulian@gmail.com>
Date: Sat, 27 May 2023 06:52:57 +0000 (-0500)
Subject: Rename to avoid arc4random_buf static definition clashing
X-Git-Tag: v3.7.0~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eead56c4cf60637f9313e14f45838ded726bfd0a;p=thirdparty%2Flibarchive.git

Rename to avoid arc4random_buf static definition clashing
---

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 <pthread.h>
 #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();