diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-15 09:30:32 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2006-09-15 09:30:32 +0000 |
| commit | bf0fca6c1ceb7c394e7a0c8f8826b0a5d29e28c3 (patch) | |
| tree | 5a0edcd5f0d8a51d5b582d730b615823e1ce2d73 /source/lib/socket/netif.c | |
| parent | bc6bd6b4958ef70a383ab89d0c2a1fb401323aeb (diff) | |
| download | samba-bf0fca6c1ceb7c394e7a0c8f8826b0a5d29e28c3.tar.gz samba-bf0fca6c1ceb7c394e7a0c8f8826b0a5d29e28c3.tar.xz samba-bf0fca6c1ceb7c394e7a0c8f8826b0a5d29e28c3.zip | |
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
Diffstat (limited to 'source/lib/socket/netif.c')
| -rw-r--r-- | source/lib/socket/netif.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/lib/socket/netif.c b/source/lib/socket/netif.c index 0344febf380..7484baa6813 100644 --- a/source/lib/socket/netif.c +++ b/source/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 <sys/stropts.h> @@ -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; |