diff options
| author | tron <tron> | 2000-11-29 21:02:04 +0000 |
|---|---|---|
| committer | tron <tron> | 2000-11-29 21:02:04 +0000 |
| commit | 40f13b501db8a79d6cbb32dde8577d9b498a5d13 (patch) | |
| tree | 9d3bc78fe3a15694920a78ed7b845274b1a3930e /devel/libgtop/patches | |
| parent | 4d8aa6a41e5de8d71afc7b5c185cefd8dd852a7d (diff) | |
| download | pkgsrc-40f13b501db8a79d6cbb32dde8577d9b498a5d13.tar.gz | |
Make this compile again under NetBSD-1.5L by "#ifdef"-ing checks which
are not required any more after UBC has been integrated. The information
for the fix was provided by Chuck Silvers in private e-mail.
Diffstat (limited to 'devel/libgtop/patches')
| -rw-r--r-- | devel/libgtop/patches/patch-aq | 20 | ||||
| -rw-r--r-- | devel/libgtop/patches/patch-ar | 20 |
2 files changed, 34 insertions, 6 deletions
diff --git a/devel/libgtop/patches/patch-aq b/devel/libgtop/patches/patch-aq index 381ce21ff67..96e8f7a0b91 100644 --- a/devel/libgtop/patches/patch-aq +++ b/devel/libgtop/patches/patch-aq @@ -1,7 +1,7 @@ -$NetBSD: patch-aq,v 1.1 2000/07/30 02:45:41 jlam Exp $ +$NetBSD: patch-aq,v 1.2 2000/11/29 21:02:05 tron Exp $ ---- sysdeps/freebsd/procmap.c.orig Thu May 27 14:56:48 1999 -+++ sysdeps/freebsd/procmap.c Sat Jul 29 22:09:34 2000 +--- sysdeps/freebsd/procmap.c.orig Thu May 27 20:56:48 1999 ++++ sysdeps/freebsd/procmap.c Wed Nov 29 21:57:15 2000 @@ -32,9 +32,13 @@ #include <sys/param.h> #include <sys/proc.h> @@ -30,3 +30,17 @@ $NetBSD: patch-aq,v 1.1 2000/07/30 02:45:41 jlam Exp $ /* Fixme ... */ #undef _KERNEL #define _UVM_UVM_AMAP_I_H_ 1 +@@ -214,11 +221,13 @@ + #endif + + #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) ++#if defined(UVM_VNODE_VALID) + if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID) + continue; + + if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || + !vnode.v_data) continue; ++#endif + + if (kvm_read (server->machine.kd, + (unsigned long) vnode.v_data, diff --git a/devel/libgtop/patches/patch-ar b/devel/libgtop/patches/patch-ar index e66541a119b..2b1336b9620 100644 --- a/devel/libgtop/patches/patch-ar +++ b/devel/libgtop/patches/patch-ar @@ -1,7 +1,7 @@ -$NetBSD: patch-ar,v 1.1 2000/07/30 02:45:41 jlam Exp $ +$NetBSD: patch-ar,v 1.2 2000/11/29 21:02:05 tron Exp $ ---- sysdeps/freebsd/procmem.c.orig Thu May 27 14:56:49 1999 -+++ sysdeps/freebsd/procmem.c Sat Jul 29 22:23:54 2000 +--- sysdeps/freebsd/procmem.c.orig Thu May 27 20:56:49 1999 ++++ sysdeps/freebsd/procmem.c Wed Nov 29 21:57:31 2000 @@ -31,8 +31,12 @@ #include <sys/param.h> #include <sys/proc.h> @@ -39,3 +39,17 @@ $NetBSD: patch-ar,v 1.1 2000/07/30 02:45:41 jlam Exp $ #else struct vm_object object; #endif +@@ -233,11 +241,13 @@ + /* If the object is of type vnode, add its size */ + + #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) ++#if defined(UVM_VNODE_VALID) + if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID) + continue; + + if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || + !vnode.v_data) continue; ++#endif + + /* Reference count must be at least two. */ + if (vnode.v_uvm.u_obj.uo_refs <= 1) |