diff options
author | bcook <> | 2015-04-27 03:37:06 +0000 |
---|---|---|
committer | bcook <> | 2015-04-27 03:37:06 +0000 |
commit | 9e874579a3d35b6a89acefa2792ff97236256dc2 (patch) | |
tree | 3666c8ed22fb538a37dac8445d659e9c829feb35 /src | |
parent | 4335bcac307bd2bbc5762aa1954f72a9690668aa (diff) | |
download | openbsd-9e874579a3d35b6a89acefa2792ff97236256dc2.tar.gz openbsd-9e874579a3d35b6a89acefa2792ff97236256dc2.tar.bz2 openbsd-9e874579a3d35b6a89acefa2792ff97236256dc2.zip |
Not all Linux libc's include linux/sysctl.h in sys/sysctl.h.
Include it if we have the sysctl syscall.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/arc4random/getentropy_linux.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/crypto/getentropy_linux.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/libcrypto/arc4random/getentropy_linux.c b/src/lib/libcrypto/arc4random/getentropy_linux.c index 29e7efe234..4fce68c25b 100644 --- a/src/lib/libcrypto/arc4random/getentropy_linux.c +++ b/src/lib/libcrypto/arc4random/getentropy_linux.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: getentropy_linux.c,v 1.37 2015/03/22 13:28:03 bcook Exp $ */ | 1 | /* $OpenBSD: getentropy_linux.c,v 1.38 2015/04/27 03:37:06 bcook Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> | 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> |
@@ -27,8 +27,9 @@ | |||
27 | #include <sys/ioctl.h> | 27 | #include <sys/ioctl.h> |
28 | #include <sys/resource.h> | 28 | #include <sys/resource.h> |
29 | #include <sys/syscall.h> | 29 | #include <sys/syscall.h> |
30 | #ifdef HAVE_SYS_SYSCTL_H | 30 | #ifdef SYS__sysctl |
31 | #include <sys/sysctl.h> | 31 | #include <sys/sysctl.h> |
32 | #include <linux/sysctl.h> | ||
32 | #endif | 33 | #endif |
33 | #include <sys/statvfs.h> | 34 | #include <sys/statvfs.h> |
34 | #include <sys/socket.h> | 35 | #include <sys/socket.h> |
diff --git a/src/lib/libcrypto/crypto/getentropy_linux.c b/src/lib/libcrypto/crypto/getentropy_linux.c index 29e7efe234..4fce68c25b 100644 --- a/src/lib/libcrypto/crypto/getentropy_linux.c +++ b/src/lib/libcrypto/crypto/getentropy_linux.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: getentropy_linux.c,v 1.37 2015/03/22 13:28:03 bcook Exp $ */ | 1 | /* $OpenBSD: getentropy_linux.c,v 1.38 2015/04/27 03:37:06 bcook Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> | 4 | * Copyright (c) 2014 Theo de Raadt <deraadt@openbsd.org> |
@@ -27,8 +27,9 @@ | |||
27 | #include <sys/ioctl.h> | 27 | #include <sys/ioctl.h> |
28 | #include <sys/resource.h> | 28 | #include <sys/resource.h> |
29 | #include <sys/syscall.h> | 29 | #include <sys/syscall.h> |
30 | #ifdef HAVE_SYS_SYSCTL_H | 30 | #ifdef SYS__sysctl |
31 | #include <sys/sysctl.h> | 31 | #include <sys/sysctl.h> |
32 | #include <linux/sysctl.h> | ||
32 | #endif | 33 | #endif |
33 | #include <sys/statvfs.h> | 34 | #include <sys/statvfs.h> |
34 | #include <sys/socket.h> | 35 | #include <sys/socket.h> |