diff options
| author | grog <grog@FreeBSD.org> | 1999-05-07 01:35:29 +0000 |
|---|---|---|
| committer | grog <grog@FreeBSD.org> | 1999-05-07 01:35:29 +0000 |
| commit | b1c24e47cf445b208ca4b0c11f66015e0d8af795 (patch) | |
| tree | a58a56e5f700ab0dd464bc844bfaf084bece3bed /sys/dev/vinum/vinumparser.c | |
| parent | 234c1fa0c863ee28a36cb7b824eba10054e159ed (diff) | |
| download | FreeBSD-src-b1c24e47cf445b208ca4b0c11f66015e0d8af795.zip FreeBSD-src-b1c24e47cf445b208ca4b0c11f66015e0d8af795.tar.gz | |
Remove old grunge, including references to sys/disk.h (which is going
away).
Submitted-by: phk
Diffstat (limited to 'sys/dev/vinum/vinumparser.c')
| -rw-r--r-- | sys/dev/vinum/vinumparser.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c index 9fb74db..3dda64d 100644 --- a/sys/dev/vinum/vinumparser.c +++ b/sys/dev/vinum/vinumparser.c @@ -56,27 +56,20 @@ * a closing quote. In this case, tokenize() returns -1. */ -#ifdef KERNEL -#include "opt_vinum.h" -#endif - #include <sys/param.h> -#ifdef KERNEL -#undef KERNEL /* XXX */ -#define REALLYKERNEL -#include "opt_vinum.h" -#else +#ifndef KERNEL #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 <sys/device.h> -#include <sys/disk.h> #include <sys/buf.h> #include <dev/vinum/vinumvar.h> @@ -84,7 +77,7 @@ #include <dev/vinum/vinumio.h> #include <dev/vinum/vinumext.h> -#ifdef REALLYKERNEL +#ifdef KERNEL #define isspace(c) ((c == ' ') || (c == '\t')) /* check for white space */ #else /* get it from the headers */ #include <ctype.h> |
