From 75c1df31cff84d203a3711e12c3ab54057b4c89c Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 2 Mar 2018 23:31:55 +0000
Subject: [PATCH] Fix build post r330299

---
 contrib/netbsd-tests/kernel/t_sysv.c | 2 --
 usr.bin/ipcrm/ipcrm.c                | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/netbsd-tests/kernel/t_sysv.c b/contrib/netbsd-tests/kernel/t_sysv.c
index 638f59c498f3..8d1e32ed21ee 100644
--- a/contrib/netbsd-tests/kernel/t_sysv.c
+++ b/contrib/netbsd-tests/kernel/t_sysv.c
@@ -94,13 +94,11 @@ key_t	msgkey, semkey, shmkey;
 
 int	maxloop = 1;
 
-#ifndef __FreeBSD__
 union semun {
 	int	val;		/* value for SETVAL */
 	struct	semid_ds *buf;	/* buffer for IPC_{STAT,SET} */
 	u_short	*array;		/* array for GETALL & SETALL */
 };
-#endif
 
 
 /* Writes an integer to a file.  To be used from the body of the test
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 2ca65a3009e6..7f132c182a07 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #define	_WANT_SYSVMSG_INTERNALS
 #include <sys/msg.h>
 #define	_WANT_SYSVSEM_INTERNALS
+#define	_WANT_SEMUN
 #include <sys/sem.h>
 #define	_WANT_SYSVSHM_INTERNALS
 #include <sys/shm.h>