From e562403e1c11449aa007e78689d045453aa41298 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 21 Mar 2016 08:25:03 +0000 Subject: [PATCH] - Fix compile of getentropy_linux for SLES11 servicepack 4. git-svn-id: file:///svn/unbound/trunk@3683 be551aaa-1e26-0410-a405-d3ace91eadb9 --- compat/getentropy_linux.c | 6 +++--- doc/Changelog | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/compat/getentropy_linux.c b/compat/getentropy_linux.c index 37d86a8f1..f8c5e0f7e 100644 --- a/compat/getentropy_linux.c +++ b/compat/getentropy_linux.c @@ -94,7 +94,7 @@ int getentropy(void *buf, size_t len); extern int main(int, char *argv[]); #endif static int gotdata(char *buf, size_t len); -#ifdef SYS_getrandom +#if defined(SYS_getrandom) && defined(__NR_getrandom) static int getentropy_getrandom(void *buf, size_t len); #endif static int getentropy_urandom(void *buf, size_t len); @@ -113,7 +113,7 @@ getentropy(void *buf, size_t len) return -1; } -#ifdef SYS_getrandom +#if defined(SYS_getrandom) && defined(__NR_getrandom) /* * Try descriptor-less getrandom() */ @@ -209,7 +209,7 @@ gotdata(char *buf, size_t len) return 0; } -#ifdef SYS_getrandom +#if defined(SYS_getrandom) && defined(__NR_getrandom) static int getentropy_getrandom(void *buf, size_t len) { diff --git a/doc/Changelog b/doc/Changelog index f73c37133..53cb2c567 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +21 March 2016: Ralph + - Fix compile of getentropy_linux for SLES11 servicepack 4. + 18 March 2016: Ralph - Validate QNAME minimised NXDOMAIN responses. - If QNAME minimisation is enabled, do cache lookup for QTYPE NS in -- 2.47.3