On Thu, Feb 25, 2016 at 09:29:02AM -0700, Eric Blake wrote:
> On 02/25/2016 08:31 AM, Ed Maste wrote:
> > EAI_ADDRFAMILY is obsolete and FreeBSD/s netdb.h does not provide a
> > definition.
> >
> > Signed-off-by: Ed Maste <ema...@freebsd.org>
> > ---
> > tests/test-io-channel-socket.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
> > index 0697363..f4dbd60 100644
> > --- a/tests/test-io-channel-socket.c
> > +++ b/tests/test-io-channel-socket.c
> > @@ -63,7 +63,10 @@ static int check_protocol_support(bool *has_ipv4, bool
> > *has_ipv6)
> >
> > gaierr = getaddrinfo("::1", NULL, &hints, &ai);
> > if (gaierr != 0) {
> > - if (gaierr == EAI_ADDRFAMILY ||
> > + if (
> > +#ifdef EAI_ADDRFAMILY
> > + gaierr == EAI_ADDRFAMILY ||
> > +#endif
> > gaierr == EAI_FAMILY ||
>
> I'm not the biggest-fan of mid-expression #ifdefs. Can we rewrite this
> to look more like:
>
> #ifndef EAI_ADDRFAMILY
> #define EAI_ADDRFAMILY EAI_FAMILY
> #endif
>
> and leave the conditional expression unchanged?
I think that'll cause gcc 6 to whine about you checking the same
value twice in the conditional, like how it complains that EWOULDBLOCK
and EAGAIN are the same.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
