summaryrefslogtreecommitdiffstats
path: root/sys/dev/vinum
diff options
context:
space:
mode:
authorgrog <grog@FreeBSD.org>2000-12-20 05:17:29 +0000
committergrog <grog@FreeBSD.org>2000-12-20 05:17:29 +0000
commit8b040789d7dcab9c7a9d9b15df6e7d8713e651f9 (patch)
tree6c1256bede90636130f69862b63a7cbeb47dcfc4 /sys/dev/vinum
parent36a1771965de70fb49f02ee50d4cb74e8a419989 (diff)
downloadFreeBSD-src-8b040789d7dcab9c7a9d9b15df6e7d8713e651f9.zip
FreeBSD-src-8b040789d7dcab9c7a9d9b15df6e7d8713e651f9.tar.gz
Rearrange #includes to make more sense. This is still not the reform
that bde is waiting to see, but at least it works.
Diffstat (limited to 'sys/dev/vinum')
-rw-r--r--sys/dev/vinum/vinumparser.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index 59d9aba..f876321 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -58,23 +58,25 @@
*/
#include <sys/param.h>
+#include <dev/vinum/vinumkw.h>
#ifdef _KERNEL
-#include <sys/conf.h>
#include <sys/systm.h>
+#include <sys/conf.h>
#include <machine/setjmp.h>
-#else
-#include <ctype.h>
-#endif
+/* 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 <dev/vinum/vinumvar.h>
-#include <dev/vinum/vinumkw.h>
#include <dev/vinum/vinumio.h>
#include <dev/vinum/vinumext.h>
-
-#ifdef _KERNEL
#define iswhite(c) ((c == ' ') || (c == '\t')) /* check for white space */
-#else /* get it from the headers */
+#else /* userland */
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
#define iswhite isspace /* use the ctype macro */
#endif
OpenPOWER on IntegriCloud