diff options
| author | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-19 15:54:32 -0500 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-19 15:54:32 -0500 |
| commit | bffd56939233ed0168c687118411be631cd30244 (patch) | |
| tree | e6e68359e2f61d49a4b0b68db094373a42d33cf4 /source3/lib/interfaces.c | |
| parent | 23f6c371c992de211e10b7ae9cd46de3ec672143 (diff) | |
| parent | 80b7bcb5fbc98964014b5c8082a626aef24c5feb (diff) | |
| download | samba-bffd56939233ed0168c687118411be631cd30244.tar.gz samba-bffd56939233ed0168c687118411be631cd30244.tar.xz samba-bffd56939233ed0168c687118411be631cd30244.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 23d3db0c229fe5e1d69f890d87c2be39b356ffb5)
Diffstat (limited to 'source3/lib/interfaces.c')
| -rw-r--r-- | source3/lib/interfaces.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/interfaces.c b/source3/lib/interfaces.c index 2b93a5ba39..3b15e3e87b 100644 --- a/source3/lib/interfaces.c +++ b/source3/lib/interfaces.c @@ -128,7 +128,7 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces) continue; } -#ifdef AF_INET6 +#if defined(HAVE_IPV6) if (ifptr->ifa_addr->sa_family == AF_INET6) { copy_size = sizeof(struct sockaddr_in6); } @@ -496,7 +496,7 @@ static int iface_comp(struct iface_struct *i1, struct iface_struct *i2) { int r; -#ifdef AF_INET6 +#if defined(HAVE_IPV6) /* * If we have IPv6 - sort these interfaces lower * than any IPv4 ones. |