summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2014-06-26 13:57:44 +0000
committerpjd <pjd@FreeBSD.org>2014-06-26 13:57:44 +0000
commit64b5b5018dcee045b6358fff8c4a0adfd7d2a05f (patch)
tree681dad1fed0950e50ff9cdf36936238a9c012ee4
parent2faded8827e6345a39d1a4831f3d8661e29ea88c (diff)
downloadFreeBSD-src-64b5b5018dcee045b6358fff8c4a0adfd7d2a05f.zip
FreeBSD-src-64b5b5018dcee045b6358fff8c4a0adfd7d2a05f.tar.gz
Remove duplicated includes.
Submitted by: Mariusz Zaborski <oshogbo@FreeBSD.org>
-rw-r--r--sbin/dhclient/bpf.c2
-rw-r--r--sbin/dhclient/dhclient.c2
-rw-r--r--sys/kern/kern_exec.c1
-rw-r--r--sys/kern/subr_capability.c6
4 files changed, 2 insertions, 9 deletions
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c
index 7c2e531..78b9eb6 100644
--- a/sbin/dhclient/bpf.c
+++ b/sbin/dhclient/bpf.c
@@ -43,8 +43,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/capsicum.h>
-
#include "dhcpd.h"
#include "privsep.h"
#include <sys/capsicum.h>
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index c43bda9..22b21f1 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -56,8 +56,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/capsicum.h>
-
#include "dhcpd.h"
#include "privsep.h"
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 667715e..078cd38 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/systm.h>
-#include <sys/capsicum.h>
#include <sys/eventhandler.h>
#include <sys/lock.h>
#include <sys/mutex.h>
diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c
index 1504435..f3daa5e 100644
--- a/sys/kern/subr_capability.c
+++ b/sys/kern/subr_capability.c
@@ -34,16 +34,14 @@ __FBSDID("$FreeBSD$");
* Note that this file is compiled into the kernel and into libc.
*/
-#ifdef _KERNEL
#include <sys/types.h>
#include <sys/capsicum.h>
+
+#ifdef _KERNEL
#include <sys/systm.h>
#include <machine/stdarg.h>
#else /* !_KERNEL */
-#include <sys/types.h>
-#include <sys/capsicum.h>
-
#include <assert.h>
#include <stdarg.h>
#include <stdbool.h>
OpenPOWER on IntegriCloud