Changeset cf3aee19 in mainline for uspace/lib/c/include/inet/addr.h

Timestamp:

2015-06-17T23:45:24Z (9 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

523b17a

Parents:

fc7bf19 (diff), 2654afb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Sync with mainline

File:

• uspace/lib/c/include/inet/addr.h (modified) (2 diffs)

uspace/lib/c/include/inet/addr.h

@@ -37 +37 @@
 
 #include <stdint.h>
-#include <net/in.h>
-#include <net/in6.h>
-#include <net/socket.h>
 
 typedef uint32_t addr32_t;
@@ -126 +123 @@
 extern void inet_addr_set(addr32_t, inet_addr_t *);
 extern void inet_naddr_set(addr32_t, uint8_t, inet_naddr_t *);
-extern void inet_sockaddr_in_addr(const sockaddr_in_t *, inet_addr_t *);
 
 extern void inet_addr_set6(addr128_t, inet_addr_t *);
 extern void inet_naddr_set6(addr128_t, uint8_t, inet_naddr_t *);
-extern void inet_sockaddr_in6_addr(const sockaddr_in6_t *, inet_addr_t *);
-
-extern uint16_t inet_addr_sockaddr_in(const inet_addr_t *, sockaddr_in_t *,
-    sockaddr_in6_t *);
-
-extern ip_ver_t ipver_from_af(int af);
-extern int inet_addr_sockaddr(const inet_addr_t *, uint16_t, sockaddr_t **,
-    socklen_t *);
 
 #endif