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

MFH: Unify macros
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 4061df9def..8340de987b 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1113,7 +1113,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_gethostbynamel, 0)
 	ZEND_ARG_INFO(0, hostname)
 ZEND_END_ARG_INFO()
 
-#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_check_record, 0, 0, 1)
 	ZEND_ARG_INFO(0, host)
@@ -1138,7 +1138,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_dns_get_mx, 0, 0, 2)
 	ZEND_ARG_INFO(1, weight) /* ARRAY_INFO(1, weight, 1) */
 ZEND_END_ARG_INFO()
 # endif
-#endif /* HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE)) */
+#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) */
 /* }}} */
 /* {{{ exec.c */
 static
@@ -3443,7 +3443,7 @@ zend_function_entry basic_functions[] = {
 	PHP_FE(gethostbyname,													arginfo_gethostbyname)
 	PHP_FE(gethostbynamel,													arginfo_gethostbynamel)
 
-#if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
 	PHP_FE(dns_check_record,												arginfo_dns_check_record)
 	PHP_FALIAS(checkdnsrr,			dns_check_record,						arginfo_dns_check_record)
 # if HAVE_DN_SKIPNAME && HAVE_DN_EXPAND
@@ -4078,7 +4078,7 @@ PHP_MINIT_FUNCTION(basic)
 	php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper TSRMLS_CC);
 #endif
 
-#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
 # if HAVE_DNS_FUNCS
 	PHP_MINIT(dns)(INIT_FUNC_ARGS_PASSTHRU);
 # endif
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 1bef335cb6..5846aaaf13 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -244,7 +244,7 @@ static char *php_gethostbyname(char *name)
 }
 /* }}} */
 
-#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
 
 /* {{{ proto int dns_check_record(string host [, string type])
    Check DNS records corresponding to a given Internet host name or IP address */
@@ -942,8 +942,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))) */
 
 /*
  * Local variables:
diff --git a/ext/standard/dns.h b/ext/standard/dns.h
index 38386879a1..97d8922784 100644
--- a/ext/standard/dns.h
+++ b/ext/standard/dns.h
@@ -31,7 +31,7 @@ PHP_FUNCTION(gethostbyaddr);
 PHP_FUNCTION(gethostbyname);
 PHP_FUNCTION(gethostbynamel);
 
-#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32))
+#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE)))
 
 PHP_FUNCTION(dns_check_record);
 # if HAVE_DN_SKIPNAME && HAVE_DN_EXPAND