git: 46b03fd89887 - stable/14 - ctl: Make ctl.h more self-contained

The branch stable/14 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=46b03fd89887bd43b7ad25d0cf7c5c5030a9446a

commit 46b03fd89887bd43b7ad25d0cf7c5c5030a9446a
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-10-16 22:45:15 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-01-02 19:20:37 +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
    
    (cherry picked from commit 55231cd180692c7299bff65e608dba20013ec0f7)
---
 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