diff options
| author | oshogbo <oshogbo@FreeBSD.org> | 2015-07-02 21:58:10 +0000 |
|---|---|---|
| committer | oshogbo <oshogbo@FreeBSD.org> | 2015-07-02 21:58:10 +0000 |
| commit | 55d95276339dc90b68f6b9108bbaeeca1fff715e (patch) | |
| tree | 80ab9f9e7fd1444c52e233037e177dfa3b7a1eff /libexec/casper | |
| parent | 029d310933bead17f87eca6486a236878b2b6dc4 (diff) | |
| download | FreeBSD-src-55d95276339dc90b68f6b9108bbaeeca1fff715e.zip FreeBSD-src-55d95276339dc90b68f6b9108bbaeeca1fff715e.tar.gz | |
Let the nv.h and dnv.h includes be only in sys directory.
Change consumers to include those files from sys.
Add duplicated files to ObsoleteFiles.
Approved by: pjd (mentor)
Diffstat (limited to 'libexec/casper')
| -rw-r--r-- | libexec/casper/dns/dns.c | 2 | ||||
| -rw-r--r-- | libexec/casper/grp/grp.c | 3 | ||||
| -rw-r--r-- | libexec/casper/pwd/pwd.c | 3 | ||||
| -rw-r--r-- | libexec/casper/random/random.c | 3 | ||||
| -rw-r--r-- | libexec/casper/sysctl/sysctl.c | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/libexec/casper/dns/dns.c b/libexec/casper/dns/dns.c index f82801e..dbdb2a2 100644 --- a/libexec/casper/dns/dns.c +++ b/libexec/casper/dns/dns.c @@ -30,6 +30,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/nv.h> #include <netinet/in.h> #include <assert.h> @@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$"); #include <libcapsicum.h> #include <libcapsicum_dns.h> #include <libcasper.h> -#include <nv.h> #include <pjdlog.h> static bool diff --git a/libexec/casper/grp/grp.c b/libexec/casper/grp/grp.c index ab28e1a..5b3e13d 100644 --- a/libexec/casper/grp/grp.c +++ b/libexec/casper/grp/grp.c @@ -30,6 +30,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/nv.h> + #include <assert.h> #include <errno.h> #include <grp.h> @@ -38,7 +40,6 @@ __FBSDID("$FreeBSD$"); #include <libcapsicum.h> #include <libcasper.h> -#include <nv.h> #include <pjdlog.h> static bool diff --git a/libexec/casper/pwd/pwd.c b/libexec/casper/pwd/pwd.c index be51ad0..0a06c5f 100644 --- a/libexec/casper/pwd/pwd.c +++ b/libexec/casper/pwd/pwd.c @@ -30,6 +30,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/nv.h> + #include <errno.h> #include <pwd.h> #include <stdlib.h> @@ -37,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include <libcapsicum.h> #include <libcasper.h> -#include <nv.h> #include <pjdlog.h> static bool diff --git a/libexec/casper/random/random.c b/libexec/casper/random/random.c index 56f1afb..db91685 100644 --- a/libexec/casper/random/random.c +++ b/libexec/casper/random/random.c @@ -30,13 +30,14 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include <sys/nv.h> + #include <errno.h> #include <stdlib.h> #include <string.h> #include <libcapsicum.h> #include <libcasper.h> -#include <nv.h> #include <pjdlog.h> #define MAXSIZE (1024 * 1024) diff --git a/libexec/casper/sysctl/sysctl.c b/libexec/casper/sysctl/sysctl.c index 8bb43b6..4cbc505 100644 --- a/libexec/casper/sysctl/sysctl.c +++ b/libexec/casper/sysctl/sysctl.c @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/types.h> #include <sys/sysctl.h> +#include <sys/nv.h> #include <errno.h> #include <stdlib.h> @@ -40,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <libcapsicum.h> #include <libcapsicum_sysctl.h> #include <libcasper.h> -#include <nv.h> #include <pjdlog.h> static int |
