diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-23 11:43:00 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-23 11:43:00 +0100 |
commit | c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6 (patch) | |
tree | 48d9110b63e34c59c1648df3ff8a7049327bc487 /runtime/net.c | |
parent | 236c96ffb124074d6efe3382b4d1b77da9a2986a (diff) | |
parent | 3a12d05433153d5c7c84f85af6b5039fbcdd1d09 (diff) | |
download | rsyslog-c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6.tar.gz rsyslog-c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6.tar.xz rsyslog-c4b0f6bcae4761cc7c41a2b07043a1bec00ad6e6.zip |
Merge branch 'v4-devel' into master
Conflicts:
runtime/rsyslog.h
runtime/wtp.c
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 04ba5d91..7653ea1d 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 @@ -1182,12 +1182,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: |