diff options
| author | bde <bde@FreeBSD.org> | 2000-10-13 13:43:37 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2000-10-13 13:43:37 +0000 |
| commit | 187e734c1d43f84ad73d42479cfb5e421dd21a98 (patch) | |
| tree | 161feeb3c54791dd33c0e383a39d7ca1d0e6511c /sys/dev/vinum | |
| parent | 3fbb5f4f82035c5afc45472b986e3a5cd88d6d47 (diff) | |
| download | FreeBSD-src-187e734c1d43f84ad73d42479cfb5e421dd21a98.zip FreeBSD-src-187e734c1d43f84ad73d42479cfb5e421dd21a98.tar.gz | |
Avoid impending world breakage.
1. Don't include <sys/conf.h> in userland. It is not used, and including it
without including its prerequisite <sys/time.h> should have broken the
world.
2. Don't include <sys/mount.h>. It is not used, except in -current it
bogusly includes <sys/stat.h> which bogusly includes <sys/time.h> and
thus accidentally provides the prerequisite in (1).
3. Cleaned up nearby include messes.
Not approved by despite 5 weeks notice: MAINTAINER
Diffstat (limited to 'sys/dev/vinum')
| -rw-r--r-- | sys/dev/vinum/vinumparser.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c index ce353bf..59d9aba 100644 --- a/sys/dev/vinum/vinumparser.c +++ b/sys/dev/vinum/vinumparser.c @@ -59,19 +59,13 @@ #include <sys/param.h> #ifdef _KERNEL +#include <sys/conf.h> #include <sys/systm.h> +#include <machine/setjmp.h> #else #include <ctype.h> -#include <errno.h> -#include <fcntl.h> #endif -#include <machine/setjmp.h> -/* All this mess for a single struct definition */ -#include <sys/uio.h> -#include <sys/namei.h> #include <sys/disklabel.h> -#include <sys/mount.h> -#include <sys/conf.h> #include <dev/vinum/vinumvar.h> #include <dev/vinum/vinumkw.h> @@ -81,7 +75,6 @@ #ifdef _KERNEL #define iswhite(c) ((c == ' ') || (c == '\t')) /* check for white space */ #else /* get it from the headers */ -#include <ctype.h> #define iswhite isspace /* use the ctype macro */ #endif |
