From d38e449413742be3287b97952a4ab89cb7415d91 Mon Sep 17 00:00:00 2001 From: marschap Date: Sat, 7 Jan 2006 12:03:12 +0000 Subject: [PATCH] apply patch by Markus Dolze which unbreaks building of the lcdproc client on recent NetBSD 3.0 and also corrects calculation of the available swap space --- clients/lcdproc/machine_NetBSD.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/clients/lcdproc/machine_NetBSD.c b/clients/lcdproc/machine_NetBSD.c index 6f97bc0..3a0044a 100644 --- a/clients/lcdproc/machine_NetBSD.c +++ b/clients/lcdproc/machine_NetBSD.c @@ -53,6 +53,10 @@ #include #include +#if (__NetBSD_Version__ >= 300000000) +#include +#endif + #include "machine.h" #include "main.h" #include "config.h" @@ -130,8 +134,13 @@ int machine_get_battstat(int *acstat, int *battflag, int *percent) int machine_get_fs(mounts_type fs[], int *cnt) { +#if (__NetBSD_Version__ >= 300000000) + struct statvfs *mntbuf; + struct statvfs *pp; +#else struct statfs *mntbuf; struct statfs *pp; +#endif int statcnt, fscnt, i; fscnt = getmntinfo(&mntbuf, MNT_WAIT); @@ -252,8 +261,8 @@ int machine_get_meminfo(meminfo_type *result) result[0].cache = pagetok(uvmexp.filepages); /* swap */ - result[1].total = uvmexp.pagesize * uvmexp.swpages; - result[1].free = uvmexp.pagesize * uvmexp.swpginuse; + result[1].total = pagetok(uvmexp.swpages); + result[1].free = pagetok(uvmexp.swpginuse); result[1].free = result[1].total - result[1].free; return(TRUE);