svn commit: r305998 - in head/usr.bin: cmp indent tr

[Conrad E. Meyer]

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>