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 a9f2e5155e738ea3d672be64ce326aebce22216f..44ef8c1ffa76afe59ad68bd7a1066474f9a10c78 100644 (file)
--- 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 2c7180806b5a19b852d606e11ead8b9c3f3db40f..547ac426f05d375b464b604b950106991138e949 100644 (file)
--- 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 */