summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeck <beck@openbsd.org>2014-07-12 15:43:49 +0000
committerbeck <beck@openbsd.org>2014-07-12 15:43:49 +0000
commit80de5d2613d0796e3c06bc8a8569deb88dffd2ed (patch)
treefb610c20ce48823e1caf343e614d88143e2da368
parentCreate the examples checksum for sysmerge at release time. (diff)
downloadwireguard-openbsd-80de5d2613d0796e3c06bc8a8569deb88dffd2ed.tar.xz
wireguard-openbsd-80de5d2613d0796e3c06bc8a8569deb88dffd2ed.zip
guard inclusion of sys/sysctl.h so we can detect at compile time and
keep linux distros happy that don't have it. ok bcook@
-rw-r--r--lib/libcrypto/arc4random/getentropy_linux.c4
-rw-r--r--lib/libcrypto/crypto/getentropy_linux.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/libcrypto/arc4random/getentropy_linux.c b/lib/libcrypto/arc4random/getentropy_linux.c
index f1320d24d50..294b23037f4 100644
--- a/lib/libcrypto/arc4random/getentropy_linux.c
+++ b/lib/libcrypto/arc4random/getentropy_linux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getentropy_linux.c,v 1.19 2014/07/12 14:46:31 deraadt Exp $ */
+/* $OpenBSD: getentropy_linux.c,v 1.20 2014/07/12 15:43:49 beck Exp $ */
/*
* Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -24,7 +24,9 @@
#include <sys/ioctl.h>
#include <sys/resource.h>
#include <sys/syscall.h>
+#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
+#endif
#include <sys/statvfs.h>
#include <sys/socket.h>
#include <sys/mount.h>
diff --git a/lib/libcrypto/crypto/getentropy_linux.c b/lib/libcrypto/crypto/getentropy_linux.c
index f1320d24d50..294b23037f4 100644
--- a/lib/libcrypto/crypto/getentropy_linux.c
+++ b/lib/libcrypto/crypto/getentropy_linux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getentropy_linux.c,v 1.19 2014/07/12 14:46:31 deraadt Exp $ */
+/* $OpenBSD: getentropy_linux.c,v 1.20 2014/07/12 15:43:49 beck Exp $ */
/*
* Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org>
@@ -24,7 +24,9 @@
#include <sys/ioctl.h>
#include <sys/resource.h>
#include <sys/syscall.h>
+#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
+#endif
#include <sys/statvfs.h>
#include <sys/socket.h>
#include <sys/mount.h>