refactor headers, especially alltypes.h, and improve C++ ABI compat

[musl] / include / arpa / inet.h

diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 82e2ac1..5dcadaa 100644 (file)
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -5,23 +5,8 @@
 extern "C" {
 #endif
 
-#if __STDC_VERSION__ >= 199901L
-#define __restrict restrict
-#elif !defined(__GNUC__)
-#define __restrict
-#endif
-
+#include <features.h>
 #include <netinet/in.h>
-#include <inttypes.h>
-
-#define __NEED_socklen_t
-#define __NEED_in_addr_t
-#define __NEED_in_port_t
-#define __NEED_uint16_t
-#define __NEED_uint32_t
-#define __NEED_struct_in_addr
-
-#include <bits/alltypes.h>
 
 uint32_t htonl(uint32_t);
 uint16_t htons(uint16_t);
@@ -29,11 +14,15 @@ uint32_t ntohl(uint32_t);
 uint16_t ntohs(uint16_t);
 
 in_addr_t inet_addr (const char *);
+in_addr_t inet_network (const char *);
 char *inet_ntoa (struct in_addr);
 int inet_pton (int, const char *__restrict, void *__restrict);
 const char *inet_ntop (int, const void *__restrict, char *__restrict, socklen_t);
 
-int inet_aton (const char *, struct in_addr *); /* nonstandard but widely used */
+int inet_aton (const char *, struct in_addr *);
+struct in_addr inet_makeaddr(int, int);
+in_addr_t inet_lnaof(struct in_addr);
+in_addr_t inet_netof(struct in_addr);
 
 #undef INET_ADDRSTRLEN
 #undef INET6_ADDRSTRLEN