mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply patch by Markus Dolze which unbreaks building of the lcdproc client

Browse Source 
on recent NetBSD 3.0 and also corrects calculation of the available swap
space
This commit is contained in:
marschap
2006-01-07 12:03:12 +00:00
parent 2d203bbbfc
commit d38e449413
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/lcdproc/machine_NetBSD.c
+11 -2
View File
@@ -53,6 +53,10 @@
#include <machine/apmvar.h> #include <machine/apmvar.h>
#include <errno.h> #include <errno.h>
#if (__NetBSD_Version__ >= 300000000)
#include <sys/statvfs.h>
#endif
#include "machine.h" #include "machine.h"
#include "main.h" #include "main.h"
#include "config.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) 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 *mntbuf;
struct statfs *pp; struct statfs *pp;
#endif
int statcnt, fscnt, i; int statcnt, fscnt, i;
fscnt = getmntinfo(&mntbuf, MNT_WAIT); fscnt = getmntinfo(&mntbuf, MNT_WAIT);
@@ -252,8 +261,8 @@ int machine_get_meminfo(meminfo_type *result)
result[0].cache = pagetok(uvmexp.filepages); result[0].cache = pagetok(uvmexp.filepages);
/* swap */ /* swap */
result[1].total = uvmexp.pagesize * uvmexp.swpages; result[1].total = pagetok(uvmexp.swpages);
result[1].free = uvmexp.pagesize * uvmexp.swpginuse; result[1].free = pagetok(uvmexp.swpginuse);
result[1].free = result[1].total - result[1].free; result[1].free = result[1].total - result[1].free;
return(TRUE); return(TRUE);