The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eee4264c9fcb24e53162c86b086832492892d1f3
commit eee4264c9fcb24e53162c86b086832492892d1f3 Author: John Baldwin <[email protected]> AuthorDate: 2023-03-08 23:05:10 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2023-03-08 23:05:10 +0000 Make <sys/systm.h> more self-contained. Replace <sys/cdefs.h> with <sys/types.h>. Other includes need types defined in <sys/types.h> and <sys/types.h> includes <sys/cdefs.h> already. While here, move the <machine/*.h> headers below the <sys/*.h> headers. Reviewed by: imp, kib Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D38841 --- sys/sys/systm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 7664a4506b0c..333a72ba9e30 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -40,13 +40,13 @@ #ifndef _SYS_SYSTM_H_ #define _SYS_SYSTM_H_ -#include <sys/cdefs.h> -#include <machine/atomic.h> -#include <machine/cpufunc.h> +#include <sys/types.h> #include <sys/callout.h> #include <sys/kassert.h> #include <sys/queue.h> #include <sys/stdint.h> /* for people using printf mainly */ +#include <machine/atomic.h> +#include <machine/cpufunc.h> __NULLABILITY_PRAGMA_PUSH
