diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-12-21 17:17:21 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2015-12-21 17:17:21 +0100 |
| commit | 0bf95f99e6126b481a4dcac574ada59f9ad3662b (patch) | |
| tree | 8b8d229fbd4dbd21a9aa14d762ed0b11753437a8 /sysdep/unix/unix.h | |
| parent | 23c212e7f1e80a3c6b88b49918972bc28375bd51 (diff) | |
Follow-up work on integration
Contains some patches from Jan Moskyto Matejka
Diffstat (limited to 'sysdep/unix/unix.h')
| -rw-r--r-- | sysdep/unix/unix.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h index 58ceab1e..6e788f08 100644 --- a/sysdep/unix/unix.h +++ b/sysdep/unix/unix.h @@ -80,14 +80,8 @@ static inline ip_addr ipa_from_sa(sockaddr *sa) static inline struct in_addr ipa_to_in4(ip_addr a) { return (struct in_addr) { htonl(ipa_to_u32(a)) }; } -#ifdef IPV6 static inline struct in6_addr ipa_to_in6(ip_addr a) { return (struct in6_addr) { .s6_addr32 = { htonl(_I0(a)), htonl(_I1(a)), htonl(_I2(a)), htonl(_I3(a)) } }; } -#else -/* Temporary dummy */ -static inline struct in6_addr ipa_to_in6(ip_addr a) -{ return (struct in6_addr) { .s6_addr32 = { 0, 0, 0, 0 } }; } -#endif void sockaddr_fill(sockaddr *sa, int af, ip_addr a, struct iface *ifa, uint port); int sockaddr_read(sockaddr *sa, int af, ip_addr *a, struct iface **ifa, uint *port); |