]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Rename to avoid arc4random_buf static definition clashing
authoruyjulian <uyjulian@gmail.com>
Sat, 27 May 2023 06:52:57 +0000 (01:52 -0500)
committerMartin Matuška <martin@matuska.de>
Thu, 13 Jul 2023 22:19:02 +0000 (00:19 +0200)
libarchive/archive_random.c

index 9d1aa493f0c8f5855671971921318fb29a7e8856..4f573c41bf398fb330055fa4c5a79e51e91fe21e 100644 (file)
@@ -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();