Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlemens Nanni <klemens@posteo.de>2022-01-11 12:58:59 +0300
committerKlemens Nanni <klemens@posteo.de>2022-01-12 00:32:15 +0300
commita707213aa1f6c635af1fb69bd7f5c06eca29a25d (patch)
treec915c9d77f3ac6484c079e8a21fdfee80eca9ba3
parentccbacbf0ab68441fe9ab9728d785b9417affb845 (diff)
BUILD(client): Plugin framework: Use correct struct kinfo_proc members on NetBSD/OpenBSD
`struct kinfo_proc` members are prefixed with `p_` in OpenBSD (http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/sys/sys/sysctl.h?annotate=1.220) and NetBSD (cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/sysctl.h?annotate=1.236) FreeBSD (https://cgit.freebsd.org/src/tree/sys/sys/user.h?id=01cad731921bb60b4f6e04c1cac987eea7af9d08#n121)and presumably Linux (I did not check) use the `ki_` prefix. Build-tested on OpenBSD 7.0-CURRENT.
-rw-r--r--src/ProcessResolver.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ProcessResolver.cpp b/src/ProcessResolver.cpp
index 631cba2fa..935598034 100644
--- a/src/ProcessResolver.cpp
+++ b/src/ProcessResolver.cpp
@@ -267,7 +267,11 @@ void ProcessResolver::doResolve() {
}
for (int i = 0; i < n_procs; ++i) {
+# if defined(__NetBSD__) || defined(__OpenBSD__)
+ addEntry(procs_info[i].p_pid, procs_info[i].p_comm, m_processMap);
+# else
addEntry(procs_info[i].ki_pid, procs_info[i].ki_comm, m_processMap);
+# endif
}
kvm_cleanup(kd);