From: Rich Felker Date: Wed, 4 Mar 2020 17:33:35 +0000 (-0500) Subject: remove duplicate definitions of INET[6]_ADDRSTRLEN X-Git-Url: https://git.librecmc.org/?p=oweals%2Fmusl.git;a=commitdiff_plain;h=2f2348c9588d61680123bbe438db38acf5dfea4c remove duplicate definitions of INET[6]_ADDRSTRLEN these were leftover from early beginnings when arpa/inet.h was not including netinet/in.h. --- diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 37f8c11e..9d20a15b 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -24,11 +24,6 @@ struct in_addr inet_makeaddr(in_addr_t, in_addr_t); in_addr_t inet_lnaof(struct in_addr); in_addr_t inet_netof(struct in_addr); -#undef INET_ADDRSTRLEN -#undef INET6_ADDRSTRLEN -#define INET_ADDRSTRLEN 16 -#define INET6_ADDRSTRLEN 46 - #ifdef __cplusplus } #endif diff --git a/include/netinet/in.h b/include/netinet/in.h index 5b8b21e6..103d2e04 100644 --- a/include/netinet/in.h +++ b/include/netinet/in.h @@ -60,8 +60,6 @@ struct ipv6_mreq { extern const struct in6_addr in6addr_any, in6addr_loopback; -#undef INET_ADDRSTRLEN -#undef INET6_ADDRSTRLEN #define INET_ADDRSTRLEN 16 #define INET6_ADDRSTRLEN 46