git: 880aec7361ea - main - cross-build: Remove redundant lines.

The branch main has been updated by imp:

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

commit 880aec7361eab106b62dea28f3dedd457b3abb47
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-10-10 16:21:49 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-10-10 17:17:14 +0000

    cross-build: Remove redundant lines.
    
    There's two identical gid_from_group lines in a row. We only need one.
    Ditto for uid_from_user().
    
    Sponsored by:           Netflix
    Reviewed by:            bapt, jrtc27
    Differential Revision:  https://reviews.freebsd.org/D32442
---
 tools/build/cross-build/include/common/grp.h | 2 --
 tools/build/cross-build/include/common/pwd.h | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tools/build/cross-build/include/common/grp.h b/tools/build/cross-build/include/common/grp.h
index 08a8bc540569..750e1e9a49f6 100644
--- a/tools/build/cross-build/include/common/grp.h
+++ b/tools/build/cross-build/include/common/grp.h
@@ -47,8 +47,6 @@ int pwcache_groupdb(int (*a_setgroupent)(int), void (*a_endgrent)(void),
 
 int gid_from_group(const char *name, gid_t *gid);
 
-int gid_from_group(const char *name, gid_t *gid);
-
 const char *group_from_gid(gid_t gid, int noname);
 
 #ifdef __linux__
diff --git a/tools/build/cross-build/include/common/pwd.h b/tools/build/cross-build/include/common/pwd.h
index e167fe47701f..14abc7fcadf0 100644
--- a/tools/build/cross-build/include/common/pwd.h
+++ b/tools/build/cross-build/include/common/pwd.h
@@ -45,8 +45,6 @@ int pwcache_userdb(int (*a_setpassent)(int), void (*a_endpwent)(void),
     struct passwd *(*a_getpwnam)(const char *),
     struct passwd *(*a_getpwuid)(uid_t));
 
-int uid_from_user(const char *name, uid_t *uid);
-
 int uid_from_user(const char *name, uid_t *uid);
 const char *user_from_uid(uid_t uid, int noname);