diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2010-12-06 22:51:47 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2010-12-06 22:51:47 +0000 |
| commit | 765af30a9a8bfca917e5df447c894a0853190178 (patch) | |
| tree | 0b44002a62dbca933d5912dcd1339c2361000eaf /sys/arch/landisk | |
| parent | 4e7753a7c93fd4040819da3289b11454d51ad050 (diff) | |
- properly remove NENTS now after fixing the fallout.
ok deraadt@
Diffstat (limited to 'sys/arch/landisk')
| -rw-r--r-- | sys/arch/landisk/stand/boot/conf.c | 7 | ||||
| -rw-r--r-- | sys/arch/landisk/stand/xxboot/boot1.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sys/arch/landisk/stand/boot/conf.c b/sys/arch/landisk/stand/boot/conf.c index deea81a3034..552cfc6d290 100644 --- a/sys/arch/landisk/stand/boot/conf.c +++ b/sys/arch/landisk/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.5 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.6 2010/12/06 22:51:46 jasper Exp $ */ /* * Copyright (c) 2006 Michael Shalayeff @@ -17,6 +17,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/param.h> #include <sys/types.h> #include <libsa.h> #include <lib/libsa/ufs.h> @@ -44,9 +45,9 @@ struct fs_ops file_system[] = { cd9660_stat, cd9660_readdir }, #endif }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "dk", blkdevstrategy, blkdevopen, blkdevclose, noioctl }, }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); diff --git a/sys/arch/landisk/stand/xxboot/boot1.c b/sys/arch/landisk/stand/xxboot/boot1.c index e379bb82ebd..ff4394564c3 100644 --- a/sys/arch/landisk/stand/xxboot/boot1.c +++ b/sys/arch/landisk/stand/xxboot/boot1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot1.c,v 1.4 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: boot1.c,v 1.5 2010/12/06 22:51:46 jasper Exp $ */ /* $NetBSD: boot1.c,v 1.1 2006/09/01 21:26:19 uwe Exp $ */ /*- @@ -55,12 +55,12 @@ struct fs_ops file_system[] = { { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat, ufs_readdir }, }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "dk", blkdevstrategy, blkdevopen, blkdevclose, noioctl }, }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); const char * boot1(uint32_t *sector) |