From owner-svn-src-head@freebsd.org  Fri Feb 16 18:07:05 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0128BF04DBC;
 Fri, 16 Feb 2018 18:07:05 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id A952F69742;
 Fri, 16 Feb 2018 18:07:04 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4277111D6;
 Fri, 16 Feb 2018 18:07:04 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1GI744x038036;
 Fri, 16 Feb 2018 18:07:04 GMT (envelope-from lwhsu@FreeBSD.org)
Received: (from lwhsu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1GI74Z1038034;
 Fri, 16 Feb 2018 18:07:04 GMT (envelope-from lwhsu@FreeBSD.org)
Message-Id: <201802161807.w1GI74Z1038034@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to
 lwhsu@FreeBSD.org using -f
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Fri, 16 Feb 2018 18:07:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r329390 - head/usr.bin/ipcs
X-SVN-Group: head
X-SVN-Commit-Author: lwhsu
X-SVN-Commit-Paths: head/usr.bin/ipcs
X-SVN-Commit-Revision: 329390
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Feb 2018 18:07:05 -0000

Author: lwhsu (ports committer)
Date: Fri Feb 16 18:07:04 2018
New Revision: 329390
URL: https://svnweb.freebsd.org/changeset/base/329390

Log:
  Follow r329348 in ipcs for getting rid of the requirement to include SysV IPC
  headers with _KERNEL
  
  Reviewed by:	jhb
  Differential Revision:	https://reviews.freebsd.org/D14398

Modified:
  head/usr.bin/ipcs/ipc.c
  head/usr.bin/ipcs/ipcs.c

Modified: head/usr.bin/ipcs/ipc.c
==============================================================================
--- head/usr.bin/ipcs/ipc.c	Fri Feb 16 18:04:27 2018	(r329389)
+++ head/usr.bin/ipcs/ipc.c	Fri Feb 16 18:07:04 2018	(r329390)
@@ -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>

Modified: head/usr.bin/ipcs/ipcs.c
==============================================================================
--- head/usr.bin/ipcs/ipcs.c	Fri Feb 16 18:04:27 2018	(r329389)
+++ head/usr.bin/ipcs/ipcs.c	Fri Feb 16 18:07:04 2018	(r329390)
@@ -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>