aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/ipcs
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2019-05-20 16:31:45 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2019-05-20 16:31:45 +0000
commit93bd3bee13ccd2b6d4fcedcf75c72f2632919037 (patch)
treee0defb5da9d891a56abd748bed0cf3dfabcf8068 /usr.bin/ipcs
parentfe141d80fa223b11b4127c27e80468041778e4ce (diff)
Notes
Diffstat (limited to 'usr.bin/ipcs')
-rw-r--r--usr.bin/ipcs/ipc.c7
-rw-r--r--usr.bin/ipcs/ipc.h3
-rw-r--r--usr.bin/ipcs/ipcs.c7
3 files changed, 11 insertions, 6 deletions
diff --git a/usr.bin/ipcs/ipc.c b/usr.bin/ipcs/ipc.c
index 3106e13219b7..d48389dd54bb 100644
--- a/usr.bin/ipcs/ipc.c
+++ b/usr.bin/ipcs/ipc.c
@@ -35,11 +35,12 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/sysctl.h>
-#define _KERNEL
+#define _WANT_SYSVMSG_INTERNALS
+#include <sys/msg.h>
+#define _WANT_SYSVSEM_INTERNALS
#include <sys/sem.h>
+#define _WANT_SYSVSHM_INTERNALS
#include <sys/shm.h>
-#include <sys/msg.h>
-#undef _KERNEL
#include <assert.h>
#include <err.h>
diff --git a/usr.bin/ipcs/ipc.h b/usr.bin/ipcs/ipc.h
index 6e89e4802acb..c1b131ac9353 100644
--- a/usr.bin/ipcs/ipc.h
+++ b/usr.bin/ipcs/ipc.h
@@ -68,3 +68,6 @@ extern kvm_t *kd;
extern struct semid_kernel *sema;
extern struct msqid_kernel *msqids;
extern struct shmid_kernel *shmsegs;
+extern struct seminfo seminfo;
+extern struct msginfo msginfo;
+extern struct shminfo shminfo;
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 269a957ac593..cc1884ad0e0b 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -32,11 +32,12 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/proc.h>
-#define _KERNEL
+#define _WANT_SYSVMSG_INTERNALS
+#include <sys/msg.h>
+#define _WANT_SYSVSEM_INTERNALS
#include <sys/sem.h>
+#define _WANT_SYSVSHM_INTERNALS
#include <sys/shm.h>
-#include <sys/msg.h>
-#undef _KERNEL
#include <err.h>
#include <fcntl.h>