- move away from old kinfo_proc2

This commit is contained in:
jasper 2011-07-06 13:02:01 +00:00
parent 9d42a3ba0f
commit 64274487e7
3 changed files with 5 additions and 26 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.18 2011/04/11 16:44:16 jasper Exp $
# $OpenBSD: Makefile,v 1.19 2011/07/06 13:02:01 jasper Exp $
DISTNAME= xps-4.2
REVISION= 4
REVISION= 5
CATEGORIES= sysutils x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=motif-pstree/}

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_NetBSD_os_c,v 1.1 2010/10/26 16:36:59 sthen Exp $
$OpenBSD: patch-src_NetBSD_os_c,v 1.2 2011/07/06 13:02:01 jasper Exp $
yes, I know there's a src/OpenBSD in there too.
it's not used somehow...
--- src/NetBSD/os.c.orig Thu Apr 24 02:21:29 2003
+++ src/NetBSD/os.c Tue Oct 26 18:33:52 2010
+++ src/NetBSD/os.c Wed Jul 6 15:01:20 2011
@@ -27,6 +27,7 @@
#include <limits.h>
#include <sys/param.h>
@ -13,15 +13,6 @@ it's not used somehow...
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
#include <Xm/Xm.h>
@@ -66,7 +67,7 @@ unsigned int
GetProcInfo(void)
{
static kvm_t *kd = NULL;
- struct kinfo_proc *kp;
+ struct kinfo_proc2 *kp;
char errbuf[_POSIX2_LINE_MAX];
int nentries;
@@ -82,11 +83,7 @@ GetProcInfo(void)
exit(5);
}
@ -31,7 +22,7 @@ it's not used somehow...
-#else
- kp = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nentries);
-#endif
+ kp = kvm_getproc2(kd, KERN_PROC_KTHREAD, 0, sizeof(struct kinfo_proc2), &nentries);
+ kp = kvm_getprocs(kd, KERN_PROC_KTHREAD, 0, sizeof(struct kinfo_proc), &nentries);
if (kp == NULL) {
char msg[_POSIX2_LINE_MAX * 2];

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_NetBSD_os_h,v 1.1 2010/10/26 16:36:59 sthen Exp $
--- src/NetBSD/os.h.orig Tue Oct 26 18:33:09 2010
+++ src/NetBSD/os.h Tue Oct 26 18:33:15 2010
@@ -36,7 +36,7 @@
#define XPS_HAVE_KERNEL_PROCS
#include "kvm.h"
-typedef struct kinfo_proc *ProcInfo;
+typedef struct kinfo_proc2 *ProcInfo;
typedef int signal_t;