diff options
| -rw-r--r-- | bin/ed/buf.c | 3 | ||||
| -rw-r--r-- | bin/ksh/history.c | 3 | ||||
| -rw-r--r-- | sbin/fsck_ext2fs/setup.c | 3 | ||||
| -rw-r--r-- | sbin/mountd/mountd.c | 3 | ||||
| -rw-r--r-- | sbin/newfs_ext2fs/newfs_ext2fs.c | 4 | ||||
| -rw-r--r-- | sbin/pflogd/pflogd.c | 3 | ||||
| -rw-r--r-- | sbin/ping/ping.c | 3 | ||||
| -rw-r--r-- | sbin/scsi/scsi.c | 4 |
8 files changed, 10 insertions, 16 deletions
diff --git a/bin/ed/buf.c b/bin/ed/buf.c index fc1ae7f4ffe..81584992d44 100644 --- a/bin/ed/buf.c +++ b/bin/ed/buf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.c,v 1.19 2009/10/27 23:59:21 deraadt Exp $ */ +/* $OpenBSD: buf.c,v 1.20 2014/11/20 15:22:39 tedu Exp $ */ /* $NetBSD: buf.c,v 1.15 1995/04/23 10:07:28 cgd Exp $ */ /* buf.c: This file contains the scratch-file buffer routines for the @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include <sys/file.h> #include <sys/stat.h> #include "ed.h" diff --git a/bin/ksh/history.c b/bin/ksh/history.c index 4f4fdd11630..92021378be3 100644 --- a/bin/ksh/history.c +++ b/bin/ksh/history.c @@ -1,4 +1,4 @@ -/* $OpenBSD: history.c,v 1.39 2010/05/19 17:36:08 jasper Exp $ */ +/* $OpenBSD: history.c,v 1.40 2014/11/20 15:22:39 tedu Exp $ */ /* * command history @@ -19,7 +19,6 @@ #include <sys/stat.h> #ifdef HISTORY -# include <sys/file.h> # include <sys/mman.h> /* diff --git a/sbin/fsck_ext2fs/setup.c b/sbin/fsck_ext2fs/setup.c index 0fa3bb3d5ac..b4c2f9d9204 100644 --- a/sbin/fsck_ext2fs/setup.c +++ b/sbin/fsck_ext2fs/setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setup.c,v 1.23 2014/07/13 16:08:53 pelikan Exp $ */ +/* $OpenBSD: setup.c,v 1.24 2014/11/20 15:22:39 tedu Exp $ */ /* $NetBSD: setup.c,v 1.1 1997/06/11 11:22:01 bouyer Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/ioctl.h> #include <sys/dkio.h> #include <sys/disklabel.h> -#include <sys/file.h> #include <errno.h> #include <fcntl.h> diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index 933e7b00446..c021f65580c 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mountd.c,v 1.77 2014/10/22 13:31:04 millert Exp $ */ +/* $OpenBSD: mountd.c,v 1.78 2014/11/20 15:22:39 tedu Exp $ */ /* $NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $ */ /* @@ -34,7 +34,6 @@ */ #include <sys/param.h> -#include <sys/file.h> #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/socket.h> diff --git a/sbin/newfs_ext2fs/newfs_ext2fs.c b/sbin/newfs_ext2fs/newfs_ext2fs.c index 2d512a40d7a..56c9fc42ffe 100644 --- a/sbin/newfs_ext2fs/newfs_ext2fs.c +++ b/sbin/newfs_ext2fs/newfs_ext2fs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs_ext2fs.c,v 1.13 2014/06/29 00:32:50 deraadt Exp $ */ +/* $OpenBSD: newfs_ext2fs.c,v 1.14 2014/11/20 15:22:39 tedu Exp $ */ /* $NetBSD: newfs_ext2fs.c,v 1.8 2009/03/02 10:38:13 tsutsui Exp $ */ /* @@ -37,7 +37,6 @@ #include <sys/ioctl.h> #include <sys/dkio.h> #include <sys/disklabel.h> -#include <sys/file.h> #include <sys/mount.h> #include <ufs/ext2fs/ext2fs.h> @@ -46,6 +45,7 @@ #include <ctype.h> #include <err.h> #include <errno.h> +#include <fcntl.h> #include <inttypes.h> #include <limits.h> #include <paths.h> diff --git a/sbin/pflogd/pflogd.c b/sbin/pflogd/pflogd.c index 6888a28310c..b3eb0b50dd5 100644 --- a/sbin/pflogd/pflogd.c +++ b/sbin/pflogd/pflogd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pflogd.c,v 1.49 2012/11/06 02:50:47 lteo Exp $ */ +/* $OpenBSD: pflogd.c,v 1.50 2014/11/20 15:22:39 tedu Exp $ */ /* * Copyright (c) 2001 Theo de Raadt @@ -32,7 +32,6 @@ #include <sys/types.h> #include <sys/ioctl.h> -#include <sys/file.h> #include <sys/stat.h> #include <sys/socket.h> #include <net/if.h> diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 5c097b5ce53..f9d37c14af5 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.112 2014/10/25 03:18:13 lteo Exp $ */ +/* $OpenBSD: ping.c,v 1.113 2014/11/20 15:22:39 tedu Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -54,7 +54,6 @@ #include <sys/types.h> #include <sys/queue.h> #include <sys/socket.h> -#include <sys/file.h> #include <sys/time.h> #include <netinet/in.h> diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c index 2775e2c4b84..a755957b07c 100644 --- a/sbin/scsi/scsi.c +++ b/sbin/scsi/scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi.c,v 1.28 2013/11/12 04:59:02 deraadt Exp $ */ +/* $OpenBSD: scsi.c,v 1.29 2014/11/20 15:22:39 tedu Exp $ */ /* $FreeBSD: scsi.c,v 1.11 1996/04/06 11:00:28 joerg Exp $ */ /* @@ -46,13 +46,13 @@ #include <sys/types.h> #include <sys/wait.h> +#include <fcntl.h> #include <stdio.h> #include <string.h> #include <stdlib.h> #include <unistd.h> #include <errno.h> #include <sys/scsiio.h> -#include <sys/file.h> #include <ctype.h> #include <signal.h> #include <err.h> |