From: Jani Taskinen <jani@php.net>
Date: Tue, 19 May 2009 11:12:20 +0000 (+0000)
Subject: MFH: Unify macros
X-Git-Tag: php-5.3.0RC3~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e36c8c49c399519ffc799bc864f1093d3f2a2beb;p=php

MFH: Unify macros
---

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index b76fa15d69..742a05f5ac 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -277,7 +277,7 @@ static char *php_gethostbyname(char *name)
 # define PHP_DNS_ALL    (PHP_DNS_A|PHP_DNS_NS|PHP_DNS_CNAME|PHP_DNS_SOA|PHP_DNS_PTR|PHP_DNS_HINFO|PHP_DNS_MX|PHP_DNS_TXT|PHP_DNS_A6|PHP_DNS_SRV|PHP_DNS_NAPTR|PHP_DNS_AAAA)
 #endif /* HAVE_DNS_FUNCS || defined(PHP_WIN32) */
 
-#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
 
 /* {{{ proto bool dns_check_record(string host [, string type])
    Check DNS records corresponding to a given Internet host name or IP address */
@@ -916,8 +916,7 @@ PHP_FUNCTION(dns_get_mx)
 }
 /* }}} */
 #endif /* HAVE_DN_SKIPNAME && HAVE_DN_EXPAND */
-#endif /* HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE)) */
-
+#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) */
 
 #if HAVE_DNS_FUNCS || defined(PHP_WIN32)