From 33ccf366718d189f206f1ed6c43cbcb7b50a2e6c Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 24 Nov 2023 13:12:57 -0700
Subject: include: 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
---
 include/iconv.h      | 2 --
 include/mqueue.h     | 1 -
 include/nl_types.h   | 1 -
 include/sched.h      | 1 -
 include/stringlist.h | 2 +-
 include/unistd.h     | 1 -
 6 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'include')

diff --git a/include/iconv.h b/include/iconv.h
index 05e7427a4bf0..a5a830b75fac 100644
--- a/include/iconv.h
+++ b/include/iconv.h
@@ -33,12 +33,10 @@
 #ifndef _ICONV_H_
 #define _ICONV_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <wchar.h>
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #ifdef __cplusplus
diff --git a/include/mqueue.h b/include/mqueue.h
index 910be7481796..b814c3f1b4ad 100644
--- a/include/mqueue.h
+++ b/include/mqueue.h
@@ -29,7 +29,6 @@
 #ifndef _MQUEUE_H_
 #define _MQUEUE_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/mqueue.h>
 #include <sys/signal.h>
diff --git a/include/nl_types.h b/include/nl_types.h
index 6ba15132126d..120d1911631f 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -34,7 +34,6 @@
 #ifndef _NL_TYPES_H_
 #define _NL_TYPES_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #ifdef _NLS_PRIVATE
diff --git a/include/sched.h b/include/sched.h
index e03f076febb1..14512559e2a8 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -29,7 +29,6 @@
 #ifndef __SCHED_H__
 #define __SCHED_H__
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/sched.h>
 #if __BSD_VISIBLE
diff --git a/include/stringlist.h b/include/stringlist.h
index c4eff6714f41..c0ac84ef8679 100644
--- a/include/stringlist.h
+++ b/include/stringlist.h
@@ -30,7 +30,7 @@
 
 #ifndef _STRINGLIST_H
 #define _STRINGLIST_H 
-#include <sys/cdefs.h>
+
 #include <sys/types.h>
 
 /*
diff --git a/include/unistd.h b/include/unistd.h
index afcb6c0ed700..e3e5675b3da0 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -32,7 +32,6 @@
 #ifndef _UNISTD_H_
 #define	_UNISTD_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>			/* XXX adds too much pollution. */
 #include <sys/unistd.h>
 #include <sys/_null.h>
-- 
cgit v1.2.3