diff options
| author | ume <ume@FreeBSD.org> | 2003-01-20 18:18:28 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2003-01-20 18:18:28 +0000 |
| commit | 76754261c8cba402c3ae269bfeece81e0a0a878e (patch) | |
| tree | fcec48cf43fb0c1c665a1b4959876618c42c07f5 /sysutils | |
| parent | de83bd483906934efc0787ca77bfc9e0adf61897 (diff) | |
| download | FreeBSD-ports-76754261c8cba402c3ae269bfeece81e0a0a878e.zip FreeBSD-ports-76754261c8cba402c3ae269bfeece81e0a0a878e.tar.gz | |
Fix build after VM_METER -> VM_TOTAL change.
Submitted by: George W. Dinolt <gdinolt@pacbell.net> with modified
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gkrellm/files/patch-src::meminfo.c | 24 | ||||
| -rw-r--r-- | sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c | 24 |
2 files changed, 48 insertions, 0 deletions
diff --git a/sysutils/gkrellm/files/patch-src::meminfo.c b/sysutils/gkrellm/files/patch-src::meminfo.c new file mode 100644 index 0000000..ef8689c --- /dev/null +++ b/sysutils/gkrellm/files/patch-src::meminfo.c @@ -0,0 +1,24 @@ +Index: src/meminfo.c +diff -u src/meminfo.c.orig src/meminfo.c +--- src/meminfo.c.orig Mon Jul 1 11:20:45 2002 ++++ src/meminfo.c Tue Jan 21 02:31:51 2003 +@@ -490,6 +490,10 @@ + #define PROC_MEMINFO_FILE "/compat/linux/proc/meminfo" + #endif + ++#ifndef VM_TOTAL ++#define VM_TOTAL VM_METER ++#endif ++ + static void + read_freebsd_meminfo() + { +@@ -502,7 +506,7 @@ + unsigned long buffers; + struct vmtotal vmt; + size_t length_vmt = sizeof(vmt); +- static int oid_vmt[] = { CTL_VM, VM_METER }; ++ static int oid_vmt[] = { CTL_VM, VM_TOTAL }; + #if __FreeBSD_version >= 410000 + static int oid_name2oid[2] = { 0, 3 }; + gint i; diff --git a/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c b/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c new file mode 100644 index 0000000..d3230ca --- /dev/null +++ b/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c @@ -0,0 +1,24 @@ +Index: src/sysdeps/freebsd.c +diff -u src/sysdeps/freebsd.c.orig src/sysdeps/freebsd.c +--- src/sysdeps/freebsd.c.orig Tue Jan 21 02:35:11 2003 ++++ src/sysdeps/freebsd.c Tue Jan 21 02:35:22 2003 +@@ -918,6 +918,10 @@ + #define PROC_MEMINFO_FILE "/compat/linux/proc/meminfo" + #endif + ++#ifndef VM_TOTAL ++#define VM_TOTAL VM_METER ++#endif ++ + static guint64 swapin, + swapout, + swap_total, +@@ -935,7 +939,7 @@ + guint64 total, used, x_used, free, shared, buffers, cached; + struct vmtotal vmt; + size_t length_vmt = sizeof(vmt); +- static int oid_vmt[] = { CTL_VM, VM_METER }; ++ static int oid_vmt[] = { CTL_VM, VM_TOTAL }; + #if __FreeBSD_version >= 410000 + gint i; + FILE *f; |
