diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-02-09 22:00:08 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-02-09 22:00:08 +0000 |
| commit | 7ba2b1fcc731085127c9976b1bae4aaaa5b8b7a7 (patch) | |
| tree | 8ca1843c1ac4d594a2850a206866f4a8ee329683 | |
| parent | 0953bc5ff775acedc22a809570a1a8858cb649fb (diff) | |
merge ia64 fixes from Jason Vas Dias
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1130 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | avahi-core/socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/avahi-core/socket.c b/avahi-core/socket.c index cd5241d..184fa1b 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -456,10 +456,10 @@ int avahi_send_dns_packet_ipv4(int fd, AvahiIfIndex interface, AvahiDnsPacket *p struct iovec io; #ifdef IP_PKTINFO struct cmsghdr *cmsg; - uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_pktinfo))]; + size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_pktinfo)) / sizeof(size_t)) + 1]; #elif defined(IP_SENDSRCADDR) struct cmsghdr *cmsg; - uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in_addr))]; + size_t cmsg_data[( CMSG_SPACE(sizeof(struct in_addr)) / sizeof(size_t)) + 1]; #endif assert(fd >= 0); @@ -542,7 +542,7 @@ int avahi_send_dns_packet_ipv6(int fd, AvahiIfIndex interface, AvahiDnsPacket *p struct msghdr msg; struct iovec io; struct cmsghdr *cmsg; - uint8_t cmsg_data[CMSG_SPACE(sizeof(struct in6_pktinfo))]; + size_t cmsg_data[(CMSG_SPACE(sizeof(struct in6_pktinfo))/sizeof(size_t)) + 1]; assert(fd >= 0); assert(p); @@ -596,7 +596,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4(int fd, AvahiIPv4Address *ret_src_add AvahiDnsPacket *p= NULL; struct msghdr msg; struct iovec io; - uint8_t aux[1024]; + size_t aux[1024 / sizeof(size_t)]; /* for alignment on ia64 ! */ ssize_t l; struct cmsghdr *cmsg; int found_addr = 0; @@ -726,7 +726,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(int fd, AvahiIPv6Address *ret_src_add AvahiDnsPacket *p = NULL; struct msghdr msg; struct iovec io; - uint8_t aux[64]; + size_t aux[1024 / sizeof(size_t)]; ssize_t l; int ms; struct cmsghdr *cmsg; |