Date: Thu, 05 Feb 2026 15:27:25 +0000 From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: c7582d56d29f - stable/14 - diff: Fix gcc build. Message-ID: <6984b6dd.1853b.603f7257@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c7582d56d29f072b4b18c90569b596d2b37f6b12 commit c7582d56d29f072b4b18c90569b596d2b37f6b12 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2025-06-20 15:30:03 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2026-02-05 14:47:46 +0000 diff: Fix gcc build. Sponsored by: Klara, Inc. (cherry picked from commit 28d9586cde8dc783f7b698b10c2b564fde14ae74) --- usr.bin/diff/diffdir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 08c2efd119ca..0eb0d07cd347 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -64,8 +64,8 @@ RB_GENERATE_STATIC(inodetree, inode, entry, inodecmp); static int vscandir(struct inodetree *tree, const char *path, struct dirent ***dirp, - int (*select)(const struct dirent *), - int (*compar)(const struct dirent **, const struct dirent **)) + int (*selectf)(const struct dirent *), + int (*comparf)(const struct dirent **, const struct dirent **)) { struct stat sb; struct inode *ino = NULL; @@ -84,7 +84,7 @@ vscandir(struct inodetree *tree, const char *path, struct dirent ***dirp, *dirp = NULL; return (0); } - if ((ret = fscandir(fd, dirp, select, compar)) < 0) + if ((ret = fscandir(fd, dirp, selectf, comparf)) < 0) goto fail; RB_INSERT(inodetree, tree, ino); close(fd);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6984b6dd.1853b.603f7257>