Date: Mon, 16 Oct 2023 22:48:00 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 55231cd18069 - main - ctl: Make ctl.h more self-contained Message-ID: <202310162248.39GMm0nO012637@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=55231cd180692c7299bff65e608dba20013ec0f7 commit 55231cd180692c7299bff65e608dba20013ec0f7 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2023-10-16 22:45:15 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2023-10-16 22:45:15 +0000 ctl: Make ctl.h more self-contained Make MALLOC_DECLARE conditional on <sys/malloc.h> and forward declare several types. Reviewed by: ken, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D42206 --- sys/cam/ctl/ctl.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h index 1b7d7ad4ec38..a211e249b2dc 100644 --- a/sys/cam/ctl/ctl.h +++ b/sys/cam/ctl/ctl.h @@ -129,7 +129,9 @@ typedef enum { #ifdef _KERNEL +#ifdef MALLOC_DECLARE /* from malloc.h */ MALLOC_DECLARE(M_CTL); +#endif struct ctl_page_index; @@ -137,9 +139,13 @@ struct ctl_page_index; SYSCTL_DECL(_kern_cam_ctl); #endif +struct cdev; struct ctl_lun; struct ctl_port; struct ctl_softc; +struct ctl_scsiio; +struct sbuf; +union ctl_io; /* * Put a string into an sbuf, escaping characters that are illegal or not
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310162248.39GMm0nO012637>