From f8079a63863ab1dfb604ec4c2e3cd6a50bb01e23 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 15 Sep 2006 09:30:32 +0000 Subject: r18548: don't use #elif as we don't notice when 2 HAVE_IFACE_ versions are defined try to find the problem on Tru64...where configure says the AIX method finds 1 interface but later can't compile netif.c. (revision 18486 was the last that detects ifconf with 2 interfaces) metze (This used to be commit 8fa9852160680054ddb5316c4ee03a03f8553a37) --- source4/lib/socket/netif.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'source4') diff --git a/source4/lib/socket/netif.c b/source4/lib/socket/netif.c index 0344febf38..7484baa681 100644 --- a/source4/lib/socket/netif.c +++ b/source4/lib/socket/netif.c @@ -152,7 +152,9 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces) return total; } -#elif HAVE_IFACE_IFREQ +#define _FOUND_IFACE_ANY +#endif /* HAVE_IFACE_IFCONF */ +#ifdef HAVE_IFACE_IFREQ #ifndef I_STR #include @@ -247,7 +249,9 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces) return total; } -#elif HAVE_IFACE_AIX +#define _FOUND_IFACE_ANY +#endif /* HAVE_IFACE_IFREQ */ +#ifdef HAVE_IFACE_AIX /**************************************************************************** this one is for AIX (tested on 4.2) @@ -335,7 +339,9 @@ static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces) return total; } -#else /* a dummy version */ +#define _FOUND_IFACE_ANY +#endif /* HAVE_IFACE_AIX */ +#ifndef _FOUND_IFACE_ANY static int _get_interfaces(struct iface_struct *ifaces, int max_interfaces) { return -1; -- cgit