X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=inline;f=include%2Farpa%2Finet.h;h=9d20a15ba4226aeb28b026b9bcb29179faf6d3a2;hb=8c0c9c69a12acc0a82590d4fd64cf633ff1dedd2;hp=9342713065bb46754daf0d1dbc67d8cfaeb9a6b4;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 93427130..9d20a15b 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -1,17 +1,12 @@
 #ifndef _ARPA_INET_H
 #define	_ARPA_INET_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
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-#include <bits/alltypes.h>
+#include <features.h>
+#include <netinet/in.h>
 
 uint32_t htonl(uint32_t);
 uint16_t htons(uint16_t);
@@ -19,15 +14,18 @@ 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 *, void *);
-const char *inet_ntop (int, const void *, char *, socklen_t);
+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(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
 
 #endif