summaryrefslogtreecommitdiff
path: root/devel/libgtop
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-11-07 23:38:02 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-11-07 23:38:02 +0000
commit021dae51b67edaab27ba7a447f118fea5fc112d2 (patch)
tree7e3a454ebf483ac23481ef423a8358402cc1c023 /devel/libgtop
parentFix a problem in the GIF pixbuf loader that caused GTK+ apps to crash when (diff)
Fix the build on -CURRENT due to a mangled patch.
Reported by: Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
Diffstat (limited to 'devel/libgtop')
-rw-r--r--devel/libgtop/files/patch-ah16
1 files changed, 9 insertions, 7 deletions
diff --git a/devel/libgtop/files/patch-ah b/devel/libgtop/files/patch-ah
index 95c6da53d9a8..e5b68af3e7ae 100644
--- a/devel/libgtop/files/patch-ah
+++ b/devel/libgtop/files/patch-ah
@@ -1,5 +1,5 @@
--- sysdeps/freebsd/procmap.c.orig Mon Nov 26 17:37:59 2001
-+++ sysdeps/freebsd/procmap.c Fri Nov 1 18:48:52 2002
++++ sysdeps/freebsd/procmap.c Thu Nov 7 18:33:32 2002
@@ -33,7 +33,11 @@
#include <sys/proc.h>
#include <sys/resource.h>
@@ -35,7 +35,7 @@
(char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace))
glibtop_error_io_r (server, "kvm_read (vmspace)");
-@@ -244,18 +253,23 @@
+@@ -244,6 +253,15 @@
&vnode, sizeof (vnode)) != sizeof (vnode))
glibtop_error_io_r (server, "kvm_read (vnode)");
@@ -49,18 +49,20 @@
+ }
+#else
if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
-+#endif
!vnode.v_data) continue;
- if (kvm_read (server->machine.kd,
- (unsigned long) vnode.v_data,
+@@ -252,13 +270,9 @@
&inode, sizeof (inode)) != sizeof (inode))
glibtop_error_io_r (server, "kvm_read (inode)");
--
+
- if (kvm_read (server->machine.kd,
- (unsigned long) vnode.v_mount,
- &mount, sizeof (mount)) != sizeof (mount))
- glibtop_error_io_r (server, "kvm_read (mount)");
-
+-
maps [i-1].inode = inode.i_number;
maps [i-1].device = inode.i_dev;
++#endif
+ #endif
+ } while (entry.next != first);
+