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
This commit is contained in:
parent
3fbb5f4f82
commit
187e734c1d
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user