The branch main has been updated by des:

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

commit 28d9586cde8dc783f7b698b10c2b564fde14ae74
Author:     Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2025-06-20 15:30:03 +0000
Commit:     Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2025-06-20 15:42:40 +0000

    diff: Fix gcc build.
    
    Sponsored by:   Klara, Inc.
---
 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 df65a84ca391..fb76a5768e1a 100644
--- a/usr.bin/diff/diffdir.c
+++ b/usr.bin/diff/diffdir.c
@@ -63,8 +63,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;
@@ -83,7 +83,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);

Reply via email to