diff options
| author | fergus.henderson <fergus.henderson@01de4be4-8c4a-0410-9132-4925637da917> | 2010-10-08 19:33:16 +0000 |
|---|---|---|
| committer | fergus.henderson <fergus.henderson@01de4be4-8c4a-0410-9132-4925637da917> | 2010-10-08 19:33:16 +0000 |
| commit | 4afe4bc8bd6618ada0bd35c46cd8d1bcd486c3cd (patch) | |
| tree | 9737ee9d389523ad5f5e90e588398b3c924bded8 | |
| parent | d5e5744aca1c0984712b180a009bbaadd76dfd0d (diff) | |
| download | distcc-4afe4bc8bd6618ada0bd35c46cd8d1bcd486c3cd.tar.gz | |
Apply patch from Ian Kumlien <Ian.Kumlien@gmail.com>,
to fix <http://code.google.com/p/distcc/issues/detail?id=70>.
This patch fixes a compile error on Gentoo Linux due to "s6_addr"
being #defined by a system header file and thus not available for
use as a local variable name.
git-svn-id: http://distcc.googlecode.com/svn/trunk@733 01de4be4-8c4a-0410-9132-4925637da917
| -rw-r--r-- | src/access.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/access.c b/src/access.c index 0e480c3..c305366 100644 --- a/src/access.c +++ b/src/access.c @@ -115,18 +115,18 @@ static inline void set_mask_inet(struct in_addr *addr, int mask_bits) { * Set a v6 address, @p addr, to a mask of @p mask_size bits. **/ static void set_mask_inet6(struct in6_addr *addr, int mask_bits) { - uint8_t *s6_addr = addr->s6_addr; + uint8_t *ip6_addr = addr->s6_addr; int allones_count = mask_bits / 8; int i; for (i = 0; i < allones_count; i++) - s6_addr[i] = allones8; + ip6_addr[i] = allones8; - s6_addr[i] = ~(allones8 >> (mask_bits % 8)); + ip6_addr[i] = ~(allones8 >> (mask_bits % 8)); i++; for (; i < 16; i++) - s6_addr[i] = 0; + ip6_addr[i] = 0; } #endif /* ENABLE_RFC2553 */ |