stand: Automated cleanup of cdefs and other formatting

Apply the following automated changes to try to eliminate
no-longer-needed sys/cdefs.h includes as well as now-empty
blank lines in a row.

Remove /^#if.*\n#endif.*\n#include\s+<sys/cdefs.h>.*\n/
Remove /\n+#include\s+<sys/cdefs.h>.*\n+#if.*\n#endif.*\n+/
Remove /\n+#if.*\n#endif.*\n+/
Remove /^#if.*\n#endif.*\n/
Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/types.h>/
Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/param.h>/
Remove /\n+#include\s+<sys/cdefs.h>\n#include\s+<sys/capsicum.h>/

Sponsored by:		Netflix

8 files changed, 0 insertions, 14 deletions

diff --git a/stand/i386/boot0/boot0.S b/stand/i386/boot0/boot0.S
index d92f8dcb05f1..123e66fca970 100644
--- a/stand/i386/boot0/boot0.S
+++ b/stand/i386/boot0/boot0.S
@@ -16,18 +16,11 @@
  */
 
 /* build options: */
-#ifdef SIO		/* use serial console on COM1.	*/
-#endif
 
 #ifdef PXE		/* enable PXE/INT18 booting with F6 */
 #define SAVE_MORE_MEMORY
 #endif
 
-#ifdef CHECK_DRIVE	/* make sure we boot from a HD. */
-#endif
-
-#ifdef ONLY_F_KEYS	/* Only F1..F6, no digits on console */
-#endif
 
 #ifdef VOLUME_SERIAL	/* support Volume serial number */
 #define B0_BASE	0x1ae	/* move the internal data area */
diff --git a/stand/i386/boot2/boot2.c b/stand/i386/boot2/boot2.c
index da699b58b3b4..b886c70f3808 100644
--- a/stand/i386/boot2/boot2.c
+++ b/stand/i386/boot2/boot2.c
@@ -13,7 +13,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/disklabel.h>
 #include <sys/diskmbr.h>
diff --git a/stand/i386/common/cons.c b/stand/i386/common/cons.c
index c3a44499b5b4..1007d6965d95 100644
--- a/stand/i386/common/cons.c
+++ b/stand/i386/common/cons.c
@@ -13,7 +13,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <machine/psl.h>
diff --git a/stand/i386/common/drv.c b/stand/i386/common/drv.c
index bc8927dc6c5e..394e1b1e8493 100644
--- a/stand/i386/common/drv.c
+++ b/stand/i386/common/drv.c
@@ -14,7 +14,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <btxv86.h>
diff --git a/stand/i386/gptboot/gptboot.c b/stand/i386/gptboot/gptboot.c
index 7cae837f9a56..949c00cdf544 100644
--- a/stand/i386/gptboot/gptboot.c
+++ b/stand/i386/gptboot/gptboot.c
@@ -13,7 +13,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/gpt.h>
 #include <sys/dirent.h>
diff --git a/stand/i386/isoboot/isoboot.c b/stand/i386/isoboot/isoboot.c
index 4c3f7af8537a..4ffe83cdc9fe 100644
--- a/stand/i386/isoboot/isoboot.c
+++ b/stand/i386/isoboot/isoboot.c
@@ -13,7 +13,6 @@
  * purpose.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/gpt.h>
 #include <sys/dirent.h>
diff --git a/stand/i386/libi386/elf32_freebsd.c b/stand/i386/libi386/elf32_freebsd.c
index 185dc0c08d0f..ae5702e5e65f 100644
--- a/stand/i386/libi386/elf32_freebsd.c
+++ b/stand/i386/libi386/elf32_freebsd.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/linker.h>
diff --git a/stand/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c
index 1ac5aefebf38..e11da0444fcd 100644
--- a/stand/i386/libi386/multiboot.c
+++ b/stand/i386/libi386/multiboot.c
@@ -34,7 +34,6 @@
  * http://www.gnu.org/software/grub/manual/multiboot/multiboot.html
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/linker.h>