cvs: php-src /ext/standard dns.c

jani Tue May 19 11:12:01 2009 UTC Modified files: /php-src/ext/standard dns.c Log: - Unify the macros http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.106&r2=1.107&diff_format=u Index: php-src/ext/standard/dns.c diff -u php-src/ext/standard/dns.c:1.106 php-src/ext/standard/dns.c:1.107 --- php-src/ext/standard/dns.c:1.106 Tue Mar 10 23:39:39 2009 +++ php-src/ext/standard/dns.c Tue May 19 11:12:01 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dns.c,v 1.106 2009/03/10 23:39:39 helly Exp $ */ +/* $Id: dns.c,v 1.107 2009/05/19 11:12:01 jani Exp $ */ /* {{{ includes */ #include "php.h" @@ -278,7 +278,7 @@ #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]) U Check DNS records corresponding to a given Internet host name or IP address */ @@ -916,8 +916,7 @@ } /* }}} */ #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) PHP_MINIT_FUNCTION(dns) {