From 3a2b0ab60709d6a7c38f42804242ad49279e5354 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 26 Mar 2023 17:25:46 -0700 Subject: [PATCH] Simplify check for __NR_getrandom There is no need for the configure script to check whether __NR_getrandom is defined, as the source code can just use #ifdef. --- configure.ac | 7 ------- src/util.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 3028f88d..1d537353 100644 --- a/configure.ac +++ b/configure.ac @@ -94,13 +94,6 @@ AC_CHECK_MEMBER([struct stat.st_mtim], [], [#include ]) -# Check for possible support for the Linux getrandom() system call -AC_CHECK_DECL([__NR_getrandom], - [AC_DEFINE([HAVE_NR_GETRANDOM], [1], [Define to 1 if the system - headers define a system call number for getrandom()])], - [], - [#include ]) - ############################################################################### # Required libraries # ############################################################################### diff --git a/src/util.c b/src/util.c index fe129286..ef4554ef 100644 --- a/src/util.c +++ b/src/util.c @@ -186,7 +186,7 @@ get_random_bytes(void *p, size_t n) { if (n == 0) return; -#ifdef HAVE_NR_GETRANDOM +#ifdef __NR_getrandom static bool getrandom_unavailable; if (getrandom_unavailable) @@ -211,7 +211,7 @@ get_random_bytes(void *p, size_t n) try_dev_urandom: ; -#endif /* HAVE_NR_GETRANDOM */ +#endif /* __NR_getrandom */ int fd = open("/dev/urandom", O_RDONLY); if (fd < 0) { ERROR_WITH_ERRNO("Unable to open /dev/urandom"); -- 2.43.0