diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-07 15:38:57 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-07 15:38:57 +0200 |
| commit | 11ee5cbdfb08ba3e42a853c08144fa24cd55d6da (patch) | |
| tree | eb981082bfe83c80b74149a1927ff0470b70db62 /runtime/net.c | |
| parent | 76c9616612a23796349a42d9b236a1cb0b836133 (diff) | |
| parent | 156d3f64e7ce50a570c1f8f95f51406c4853aad8 (diff) | |
| download | rsyslog-df72a36023708c3181553d192c138c95dcee9d52.tar.gz rsyslog-df72a36023708c3181553d192c138c95dcee9d52.tar.xz rsyslog-df72a36023708c3181553d192c138c95dcee9d52.zip | |
Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0
There are no changes compared to 4.7.5, just a re-release with the new
version number as new v4-stable. The most important new feature is Solaris
support.
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/net.c')
| -rw-r--r-- | runtime/net.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/net.c b/runtime/net.c index 0866efd7..8fd8cc2b 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -502,8 +502,8 @@ static inline void MaskIP4 (struct in_addr *addr, uint8_t bits) { addr->s_addr &= htonl(0xffffffff << (32 - bits)); } -#define SIN(sa) ((struct sockaddr_in *)(sa)) -#define SIN6(sa) ((struct sockaddr_in6 *)(sa)) +#define SIN(sa) ((struct sockaddr_in *)(void*)(sa)) +#define SIN6(sa) ((struct sockaddr_in6 *)(void*)(sa)) /* This is a cancel-safe getnameinfo() version, because we learned @@ -1165,12 +1165,12 @@ void debugListenInfo(int fd, char *type) switch(sa.sa_family) { case PF_INET: szFamily = "IPv4"; - ipv4 = (struct sockaddr_in*) &sa; + ipv4 = (struct sockaddr_in*)(void*) &sa; port = ntohs(ipv4->sin_port); break; case PF_INET6: szFamily = "IPv6"; - ipv6 = (struct sockaddr_in6*) &sa; + ipv6 = (struct sockaddr_in6*)(void*) &sa; port = ntohs(ipv6->sin6_port); break; default: |