From 93bd3bee13ccd2b6d4fcedcf75c72f2632919037 Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 20 May 2019 16:31:45 +0000
Subject: MFC r329348 (by brooks): Get rid of the requirement to include SysV
 IPC headers with _KERNEL defined in ipcrm by introducing
 _WANT_SYSVxxx_INTERNALS defines.

MFC r329390 (by lwhsu):
Follow r329348 in ipcs for getting rid of the requirement to include SysV IPC
headers with _KERNEL.

Sponsored by:	Mellanox Technologies
Approved by:	re (gjb)
---
 usr.bin/ipcs/ipc.c  | 7 ++++---
 usr.bin/ipcs/ipc.h  | 3 +++
 usr.bin/ipcs/ipcs.c | 7 ++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'usr.bin/ipcs')

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>
-- 
cgit v1.3