The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=a4513bace0e0c38d38b0c49c1daea60f2741d781
commit a4513bace0e0c38d38b0c49c1daea60f2741d781 Author: Alexander V. Chernikov <melif...@freebsd.org> AuthorDate: 2021-02-16 21:49:48 +0000 Commit: Alexander V. Chernikov <melif...@freebsd.org> CommitDate: 2021-02-16 21:49:48 +0000 Fix NOINET6 build broken by 2fe5a79425c7. Reported by: mjg --- sys/net/rtsock.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 40ce62c77c2a..3c1fea497af6 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1293,6 +1293,7 @@ rt_xaddrs(caddr_t cp, caddr_t cplim, struct rt_addrinfo *rtinfo) return (0); } +#ifdef INET static inline void fill_sockaddr_inet(struct sockaddr_in *sin, struct in_addr addr) { @@ -1304,7 +1305,9 @@ fill_sockaddr_inet(struct sockaddr_in *sin, struct in_addr addr) }; *sin = nsin; } +#endif +#ifdef INET6 static inline void fill_sockaddr_inet6(struct sockaddr_in6 *sin6, const struct in6_addr *addr6, uint32_t scopeid) @@ -1318,6 +1321,7 @@ fill_sockaddr_inet6(struct sockaddr_in6 *sin6, const struct in6_addr *addr6, }; *sin6 = nsin6; } +#endif static int cleanup_xaddrs_gateway(struct rt_addrinfo *info) @@ -1372,6 +1376,7 @@ cleanup_xaddrs_gateway(struct rt_addrinfo *info) return (0); } +#ifdef INET static int cleanup_xaddrs_inet(struct rt_addrinfo *info) { @@ -1412,7 +1417,9 @@ cleanup_xaddrs_inet(struct rt_addrinfo *info) return (0); } +#endif +#ifdef INET6 static int cleanup_xaddrs_inet6(struct rt_addrinfo *info) { @@ -1450,6 +1457,7 @@ cleanup_xaddrs_inet6(struct rt_addrinfo *info) return (0); } +#endif static int cleanup_xaddrs(struct rt_addrinfo *info) _______________________________________________ dev-commits-src-main@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"