Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Jun 2022 02:55:47 GMT
From:      Kirk McKusick <mckusick@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: ce6296caa370 - main - Fix build break in 50dc4c7.
Message-ID:  <202206240255.25O2tlWn021242@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mckusick:

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

commit ce6296caa37086d52ab413744ed1d6a61caa2197
Author:     Kirk McKusick <mckusick@FreeBSD.org>
AuthorDate: 2022-06-24 02:54:18 +0000
Commit:     Kirk McKusick <mckusick@FreeBSD.org>
CommitDate: 2022-06-24 02:54:18 +0000

    Fix build break in 50dc4c7.
    
    No functional change intended.
    
    MFC after:   1 month (with 076002f24d35)
---
 sys/ufs/ffs/ffs_subr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index b1e52f5964d9..f4c854172fb3 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -309,6 +309,7 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int isaltsblk,
  * Verify the filesystem values.
  */
 #define ILOG2(num) (fls(num) - 1)
+#undef CHK
 #define CHK(lhs, op, rhs, fmt)						\
 	if (lhs op rhs) {						\
 		printf("UFS%d superblock failed: %s (" #fmt ") %s %s ("	\



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206240255.25O2tlWn021242>