From 0a42a8d018cb5df10d58fd52db406ccd3f659571 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Wed, 14 Feb 2001 21:36:42 +0000 Subject: [PATCH] Make things work on OpenBSD 2.6; this is basically the same than on 2001-02-14 Martin Baulig * proctime.c (glibtop_get_proc_time_p): Make things work on OpenBSD 2.6; this is basically the same than on NetBSD. --- sysdeps/freebsd/ChangeLog | 5 +++++ sysdeps/freebsd/proctime.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog index 0b9fdb93..e8adcf7f 100644 --- a/sysdeps/freebsd/ChangeLog +++ b/sysdeps/freebsd/ChangeLog @@ -1,3 +1,8 @@ +2001-02-14 Martin Baulig + + * proctime.c (glibtop_get_proc_time_p): Make things work on + OpenBSD 2.6; this is basically the same than on NetBSD. + 2000-02-13 Martin Baulig * *.c: kvm_nlist () returns -1 on error, but a positive return value diff --git a/sysdeps/freebsd/proctime.c b/sysdeps/freebsd/proctime.c index d7fbecfe..0c71c593 100644 --- a/sysdeps/freebsd/proctime.c +++ b/sysdeps/freebsd/proctime.c @@ -124,7 +124,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, pid_t pid) { struct kinfo_proc *pinfo; -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) +#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912)) register struct rusage *rup; #else struct user *u_addr = (struct user *)USRSTACK; @@ -166,7 +166,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf, buf->frequency = 1000000; buf->flags = _glibtop_sysdeps_proc_time; -#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) +#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912)) glibtop_suid_enter (server); if (kvm_read (server->machine.kd,