From owner-svn-src-head@freebsd.org  Mon Sep 19 20:43:04 2016
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9230BBE1108;
 Mon, 19 Sep 2016 20:43:04 +0000 (UTC) (envelope-from cem@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 mx1.freebsd.org (Postfix) with ESMTPS id 454BE1BB;
 Mon, 19 Sep 2016 20:43:04 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8JKh3Px040009;
 Mon, 19 Sep 2016 20:43:03 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8JKh3jv040006;
 Mon, 19 Sep 2016 20:43:03 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201609192043.u8JKh3jv040006@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Mon, 19 Sep 2016 20:43:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r305998 - in head/usr.bin: cmp indent tr
X-SVN-Group: head
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.23
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: Mon, 19 Sep 2016 20:43:04 -0000

Author: cem
Date: Mon Sep 19 20:43:03 2016
New Revision: 305998
URL: https://svnweb.freebsd.org/changeset/base/305998

Log:
  Move sys/capsicum.h includes after types.h or param.h
  
  This is not actually documented or even implied in style(9).  Make the change
  to match convention.  Someone should document this convention in style(9).
  
  Reported by:	jhb
  Sponsored by:	EMC Dell Isilon

Modified:
  head/usr.bin/cmp/cmp.c
  head/usr.bin/indent/indent.c
  head/usr.bin/tr/tr.c

Modified: head/usr.bin/cmp/cmp.c
==============================================================================
--- head/usr.bin/cmp/cmp.c	Mon Sep 19 19:18:40 2016	(r305997)
+++ head/usr.bin/cmp/cmp.c	Mon Sep 19 20:43:03 2016	(r305998)
@@ -42,8 +42,8 @@ static char sccsid[] = "@(#)cmp.c	8.3 (B
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/capsicum.h>
 #include <sys/types.h>
+#include <sys/capsicum.h>
 #include <sys/stat.h>
 
 #include <err.h>

Modified: head/usr.bin/indent/indent.c
==============================================================================
--- head/usr.bin/indent/indent.c	Mon Sep 19 19:18:40 2016	(r305997)
+++ head/usr.bin/indent/indent.c	Mon Sep 19 20:43:03 2016	(r305998)
@@ -50,8 +50,8 @@ static char sccsid[] = "@(#)indent.c	5.1
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/capsicum.h>
 #include <sys/param.h>
+#include <sys/capsicum.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>

Modified: head/usr.bin/tr/tr.c
==============================================================================
--- head/usr.bin/tr/tr.c	Mon Sep 19 19:18:40 2016	(r305997)
+++ head/usr.bin/tr/tr.c	Mon Sep 19 20:43:03 2016	(r305998)
@@ -41,8 +41,8 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
 #endif
 
-#include <sys/capsicum.h>
 #include <sys/types.h>
+#include <sys/capsicum.h>
 
 #include <ctype.h>
 #include <err.h>