lcdproc client: Fix build on OpenBSD >= 5.0.
This commit is contained in:
@@ -27,6 +27,7 @@ v0.5dev (ongoing development)
|
||||
+ new driver: sdeclcd for Watchguard FireBox appliances (F. Mertz)
|
||||
+ hd44780: Added 'usb4all' connection type (T. Mohaupt)
|
||||
* Fix RPM init script hanging on recent OS (#3488223)
|
||||
* lcdproc client: Fix build on OpenBSD >= 5.0
|
||||
|
||||
v0.5.5
|
||||
+ sed1330 driver: Add support for HG25504 (L. Lagendijk)
|
||||
|
||||
@@ -61,7 +61,11 @@
|
||||
|
||||
static int pageshift;
|
||||
#define pagetok(size) ((size) << pageshift)
|
||||
#if OpenBSD >= 201111
|
||||
#define PROCSIZE(pp) ((pp)->p_vm_tsize + (pp)->p_vm_dsize + (pp)->p_vm_ssize)
|
||||
#else
|
||||
#define PROCSIZE(pp) ((pp).vm_tsize + (pp).vm_dsize + (pp).vm_ssize)
|
||||
#endif
|
||||
|
||||
|
||||
int
|
||||
@@ -291,7 +295,11 @@ machine_get_procs(LinkedList * procs)
|
||||
return (FALSE);
|
||||
}
|
||||
|
||||
#if OpenBSD >= 201111
|
||||
kprocs = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &nproc);
|
||||
#else
|
||||
kprocs = kvm_getprocs(kvmd, KERN_PROC_ALL, 0, &nproc);
|
||||
#endif
|
||||
if (kprocs == NULL) {
|
||||
perror("kvm_getprocs");
|
||||
kvm_close(kvmd);
|
||||
@@ -305,10 +313,17 @@ machine_get_procs(LinkedList * procs)
|
||||
kvm_close(kvmd);
|
||||
return (FALSE);
|
||||
}
|
||||
#if OpenBSD >= 201111
|
||||
strncpy(p->name, kprocs->p_comm, 15);
|
||||
p->name[15] = '\0';
|
||||
p->totl = pagetok(PROCSIZE(kprocs));
|
||||
p->number = kprocs->p_pid;
|
||||
#else
|
||||
strncpy(p->name, kprocs->kp_proc.p_comm, 15);
|
||||
p->name[15] = '\0';
|
||||
p->totl = pagetok(PROCSIZE(kprocs->kp_eproc.e_vm));
|
||||
p->number = kprocs->kp_proc.p_pid;
|
||||
#endif
|
||||
LL_Push(procs, (void *)p);
|
||||
|
||||
kprocs++;
|
||||
|
||||
Reference in New Issue
Block a user