svn commit: r330300 - in head: contrib/netbsd-tests/kernel usr.bin/ipcrm

Brooks Davis brooks at FreeBSD.org
Fri Mar 2 23:32:00 UTC 2018


Author: brooks
Date: Fri Mar  2 23:31:55 2018
New Revision: 330300
URL: https://svnweb.freebsd.org/changeset/base/330300

Log:
  Fix build post r330299

Modified:
  head/contrib/netbsd-tests/kernel/t_sysv.c
  head/usr.bin/ipcrm/ipcrm.c

Modified: head/contrib/netbsd-tests/kernel/t_sysv.c
==============================================================================
--- head/contrib/netbsd-tests/kernel/t_sysv.c	Fri Mar  2 22:32:53 2018	(r330299)
+++ head/contrib/netbsd-tests/kernel/t_sysv.c	Fri Mar  2 23:31:55 2018	(r330300)
@@ -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

Modified: head/usr.bin/ipcrm/ipcrm.c
==============================================================================
--- head/usr.bin/ipcrm/ipcrm.c	Fri Mar  2 22:32:53 2018	(r330299)
+++ head/usr.bin/ipcrm/ipcrm.c	Fri Mar  2 23:31:55 2018	(r330300)
@@ -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>


More information about the svn-src-all mailing list