From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Sat, 12 Jul 2014 17:13:38 +0000 (+0000)
Subject: Fixup LibreSSL code to be futurecompatible if LibreSSL stops
X-Git-Tag: release-1.5.0rc1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0688d6443f53f6c5d980149c604cbbc9e7078335;p=thirdparty%2Funbound.git

Fixup LibreSSL code to be futurecompatible if LibreSSL stops
providing the compat functions.


git-svn-id: file:///svn/unbound/trunk@3181 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/config.h.in b/config.h.in
index a9f2e5155..44ef8c1ff 100644
--- a/config.h.in
+++ b/config.h.in
@@ -923,10 +923,10 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
 #  if !HAVE_DECL_STRLCAT
 size_t strlcat(char *dst, const char *src, size_t siz);
 #  endif
-#  if !HAVE_DECL_ARC4RANDOM
+#  if !HAVE_DECL_ARC4RANDOM && defined(HAVE_ARC4RANDOM)
 uint32_t arc4random(void);
 #  endif
-#  if !HAVE_DECL_ARC4RANDOM_UNIFORM
+#  if !HAVE_DECL_ARC4RANDOM_UNIFORM && defined(HAVE_ARC4RANDOM_UNIFORM)
 uint32_t arc4random_uniform(uint32_t upper_bound);
 #  endif
 #endif /* HAVE_LIBRESSL */
diff --git a/configure.ac b/configure.ac
index 2c7180806..547ac426f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1224,10 +1224,10 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
 #  if !HAVE_DECL_STRLCAT
 size_t strlcat(char *dst, const char *src, size_t siz);
 #  endif
-#  if !HAVE_DECL_ARC4RANDOM
+#  if !HAVE_DECL_ARC4RANDOM && defined(HAVE_ARC4RANDOM)
 uint32_t arc4random(void);
 #  endif
-#  if !HAVE_DECL_ARC4RANDOM_UNIFORM
+#  if !HAVE_DECL_ARC4RANDOM_UNIFORM && defined(HAVE_ARC4RANDOM_UNIFORM)
 uint32_t arc4random_uniform(uint32_t upper_bound);
 #  endif
 #endif /* HAVE_LIBRESSL */