diff options
| author | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2015-07-02 21:58:10 +0000 |
|---|---|---|
| committer | Mariusz Zaborski <oshogbo@FreeBSD.org> | 2015-07-02 21:58:10 +0000 |
| commit | c36e54bb328697af1e6113812caecbd3bac89fe0 (patch) | |
| tree | 80ab9f9e7fd1444c52e233037e177dfa3b7a1eff /lib/libcapsicum | |
| parent | dc619c2f57b6118e762517b2b9b8ce615c982e47 (diff) | |
Notes
Diffstat (limited to 'lib/libcapsicum')
| -rw-r--r-- | lib/libcapsicum/libcapsicum.c | 2 | ||||
| -rw-r--r-- | lib/libcapsicum/libcapsicum_dns.c | 4 | ||||
| -rw-r--r-- | lib/libcapsicum/libcapsicum_grp.c | 5 | ||||
| -rw-r--r-- | lib/libcapsicum/libcapsicum_pwd.c | 3 | ||||
| -rw-r--r-- | lib/libcapsicum/libcapsicum_random.c | 4 | ||||
| -rw-r--r-- | lib/libcapsicum/libcapsicum_service.c | 3 | ||||
| -rw-r--r-- | lib/libcapsicum/libcapsicum_sysctl.c | 4 |
7 files changed, 12 insertions, 13 deletions
diff --git a/lib/libcapsicum/libcapsicum.c b/lib/libcapsicum/libcapsicum.c index 79c570f60e44..8c4d04da157e 100644 --- a/lib/libcapsicum/libcapsicum.c +++ b/lib/libcapsicum/libcapsicum.c @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> +#include <sys/nv.h> #include <assert.h> #include <errno.h> @@ -44,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "libcapsicum.h" #include "libcapsicum_impl.h" -#include "nv.h" /* * Structure describing communication channel between two separated processes. diff --git a/lib/libcapsicum/libcapsicum_dns.c b/lib/libcapsicum/libcapsicum_dns.c index a180b6b3b0ae..5f54283a460c 100644 --- a/lib/libcapsicum/libcapsicum_dns.c +++ b/lib/libcapsicum/libcapsicum_dns.c @@ -30,14 +30,14 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/nv.h> + #include <assert.h> #include <netdb.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <nv.h> - #include "libcapsicum.h" #include "libcapsicum_dns.h" diff --git a/lib/libcapsicum/libcapsicum_grp.c b/lib/libcapsicum/libcapsicum_grp.c index 267ac68c28f2..44d573e77b82 100644 --- a/lib/libcapsicum/libcapsicum_grp.c +++ b/lib/libcapsicum/libcapsicum_grp.c @@ -30,6 +30,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/dnv.h> +#include <sys/nv.h> #include <sys/param.h> #include <assert.h> @@ -39,9 +41,6 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -#include <dnv.h> -#include <nv.h> - #include "libcapsicum.h" #include "libcapsicum_grp.h" diff --git a/lib/libcapsicum/libcapsicum_pwd.c b/lib/libcapsicum/libcapsicum_pwd.c index 32eeeb022462..5b44c3463def 100644 --- a/lib/libcapsicum/libcapsicum_pwd.c +++ b/lib/libcapsicum/libcapsicum_pwd.c @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> +#include <sys/nv.h> #include <assert.h> #include <errno.h> @@ -39,8 +40,6 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> -#include <nv.h> - #include "libcapsicum.h" #include "libcapsicum_pwd.h" diff --git a/lib/libcapsicum/libcapsicum_random.c b/lib/libcapsicum/libcapsicum_random.c index 2c3eb3635767..2a7b109cd47a 100644 --- a/lib/libcapsicum/libcapsicum_random.c +++ b/lib/libcapsicum/libcapsicum_random.c @@ -30,12 +30,12 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/nv.h> + #include <assert.h> #include <errno.h> #include <string.h> -#include <nv.h> - #include "libcapsicum.h" #include "libcapsicum_random.h" diff --git a/lib/libcapsicum/libcapsicum_service.c b/lib/libcapsicum/libcapsicum_service.c index edfde8cc0a43..6b6ceeac08de 100644 --- a/lib/libcapsicum/libcapsicum_service.c +++ b/lib/libcapsicum/libcapsicum_service.c @@ -30,12 +30,13 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/nv.h> + #include <assert.h> #include <errno.h> #include <string.h> #include <unistd.h> -#include <nv.h> #include "msgio.h" #include "libcapsicum.h" diff --git a/lib/libcapsicum/libcapsicum_sysctl.c b/lib/libcapsicum/libcapsicum_sysctl.c index fc691136cd0b..3f1ccd9116c0 100644 --- a/lib/libcapsicum/libcapsicum_sysctl.c +++ b/lib/libcapsicum/libcapsicum_sysctl.c @@ -30,11 +30,11 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/nv.h> + #include <errno.h> #include <string.h> -#include <nv.h> - #include "libcapsicum.h" #include "libcapsicum_sysctl.h" |