diff options
author | bde <bde@FreeBSD.org> | 1997-03-23 03:37:54 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-03-23 03:37:54 +0000 |
commit | 0d3591bdbd3a026b25e6400f8cc2717489321ee5 (patch) | |
tree | 6f29bb8eda668548be86212b07bea087a25e6b3d /sys/compat | |
parent | 9c1cce114fbef8364b2d49669b0215e8bac94fd3 (diff) | |
download | FreeBSD-src-0d3591bdbd3a026b25e6400f8cc2717489321ee5.zip FreeBSD-src-0d3591bdbd3a026b25e6400f8cc2717489321ee5.tar.gz |
Don't #include <sys/fcntl.h> in <sys/file.h> if KERNEL is defined.
Fixed everything that depended on getting fcntl.h stuff from the wrong
place. Most things don't depend on file.h stuff at all.
Diffstat (limited to 'sys/compat')
-rw-r--r-- | sys/compat/linux/linux_ioctl.c | 3 | ||||
-rw-r--r-- | sys/compat/linux/linux_misc.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index c2e8780..75bf626 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: linux_ioctl.c,v 1.14 1997/02/22 09:38:21 peter Exp $ */ #include <sys/param.h> @@ -34,6 +34,7 @@ #include <sys/proc.h> #include <sys/ioctl.h> #include <sys/ioctl_compat.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/tty.h> diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 0fb8085..706e83d 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: linux_misc.c,v 1.24 1997/02/22 09:38:23 peter Exp $ */ #include <sys/param.h> @@ -36,7 +36,7 @@ #include <sys/mman.h> #include <sys/proc.h> #include <sys/dirent.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/filedesc.h> #include <sys/ioctl.h> #include <sys/imgact_aout.h> |