git: 976b977c61fb - main - zfs: Increase compatibility for different environments

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=976b977c61fbbc4b6a10a16ea225ad6a1a0e82ba

commit 976b977c61fbbc4b6a10a16ea225ad6a1a0e82ba
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-07-24 21:53:14 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-07-24 22:53:36 +0000

    zfs: Increase compatibility for different environments
    
    libsa uses the full OpenZFS compilation environment when we build this
    included in zfs.c there. Other parts of the tree have not been adapted
    to the full OpenZFS environment yet and need these ASSERT* defines to
    build properly. Since the ASSERT* macros are normally defined in
    sys/debug.h in the OpenZFS compatibility spl, only define them when
    ASSERT3S is not defined to cope with the parts of the loader that don't
    yet use the full OpenZFS environment.
    
    Sponsored by:           Netflix
    Reviewed by:            tsoome, delphij
    Differential Revision:  https://reviews.freebsd.org/D35893
---
 sys/cddl/boot/zfs/zfssubr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/cddl/boot/zfs/zfssubr.c b/sys/cddl/boot/zfs/zfssubr.c
index c5ee4fda4579..1dcb0829680c 100644
--- a/sys/cddl/boot/zfs/zfssubr.c
+++ b/sys/cddl/boot/zfs/zfssubr.c
@@ -30,11 +30,13 @@ __FBSDID("$FreeBSD$");
 
 static uint64_t zfs_crc64_table[256];
 
+#ifndef ASSERT3S	/* Proxy for all the assert defines */
 #define	ASSERT3S(x, y, z)	((void)0)
 #define	ASSERT3U(x, y, z)	((void)0)
 #define	ASSERT3P(x, y, z)	((void)0)
 #define	ASSERT0(x)		((void)0)
 #define	ASSERT(x)		((void)0)
+#endif
 
 #define	panic(...)	do {						\
 	printf(__VA_ARGS__);						\