From: Mark Andrews <marka@isc.org>
Date: Tue, 4 Jun 2002 23:26:16 +0000 (+0000)
Subject: || should have been && in #if test.
X-Git-Tag: v9.0.1^2~8328
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=5ddbaad44e4dee308c6ed7a6f99592a69fd90b5a;p=thirdparty%2Fbind9.git

|| should have been && in #if test.
---

diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index bbaa746f4f4..eccdeb84842 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.27 2002/05/30 01:28:53 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.28 2002/06/04 23:26:16 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
@@ -314,7 +314,7 @@ internal_current4(isc_interfaceiter_t *iter) {
 	struct ifreq ifreq;
 	int family;
 	char strbuf[ISC_STRERRORSIZE];
-#if !defined(SIOCGLIFCONF) || defined(SIOCGLIFADDR)
+#if !defined(SIOCGLIFCONF) && defined(SIOCGLIFADDR)
 	struct if_laddrreq if_laddrreq;
 	int i, bits;
 #endif
@@ -392,7 +392,7 @@ internal_current4(isc_interfaceiter_t *iter) {
 	if ((ifreq.ifr_flags & IFF_LOOPBACK) != 0)
 		iter->current.flags |= INTERFACE_F_LOOPBACK;
 
-#if !defined(SIOCGLIFCONF) || defined(SIOCGLIFADDR)
+#if !defined(SIOCGLIFCONF) && defined(SIOCGLIFADDR)
 	if (family == AF_INET) 
 		goto inet;