From a71c133efb7026da05ac2f7f41a6926bc5824a63 Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse Date: Mon, 6 Dec 2010 22:11:02 +0000 Subject: - partially revert previous NENTS removal for arches which got busted. --- sys/arch/landisk/stand/boot/conf.c | 6 +++--- sys/arch/landisk/stand/xxboot/boot1.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sys/arch/landisk') diff --git a/sys/arch/landisk/stand/boot/conf.c b/sys/arch/landisk/stand/boot/conf.c index 13845460097..deea81a3034 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.4 2010/12/06 18:44:49 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.5 2010/12/06 22:11:01 jasper Exp $ */ /* * Copyright (c) 2006 Michael Shalayeff @@ -44,9 +44,9 @@ struct fs_ops file_system[] = { cd9660_stat, cd9660_readdir }, #endif }; -int nfsys = nitems(file_system); +int nfsys = NENTS(file_system); struct devsw devsw[] = { { "dk", blkdevstrategy, blkdevopen, blkdevclose, noioctl }, }; -int ndevs = nitems(devsw); +int ndevs = NENTS(devsw); diff --git a/sys/arch/landisk/stand/xxboot/boot1.c b/sys/arch/landisk/stand/xxboot/boot1.c index fb9b746294b..e379bb82ebd 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.3 2010/12/06 18:44:49 jasper Exp $ */ +/* $OpenBSD: boot1.c,v 1.4 2010/12/06 22:11:01 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 = nitems(file_system); +int nfsys = NENTS(file_system); struct devsw devsw[] = { { "dk", blkdevstrategy, blkdevopen, blkdevclose, noioctl }, }; -int ndevs = nitems(devsw); +int ndevs = NENTS(devsw); const char * boot1(uint32_t *sector) -- cgit v1.2.3