diff options
| author | Jani Taskinen <jani@php.net> | 2009-05-20 12:09:33 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-05-20 12:09:33 +0000 |
| commit | 77816c4ed9f000a7275b74d1220571e51004c9f2 (patch) | |
| tree | 0f5650015f60a0e7896e9704964bb24fe8884a9e | |
| parent | 020749e1609b34db1f0078e3a1d763d432da516d (diff) | |
| download | php-git-77816c4ed9f000a7275b74d1220571e51004c9f2.tar.gz | |
- Fix win32 build
| -rw-r--r-- | ext/standard/basic_functions.c | 8 | ||||
| -rw-r--r-- | ext/standard/dns.c | 5 | ||||
| -rw-r--r-- | ext/standard/dns.h | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 8340de987b..57d66aa05f 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 defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) +#if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || 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 /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) */ +#endif /* HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || 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 defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) +#if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || 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 defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) +#if HAVE_RES_SEARCH && !(defined(__BEOS__) ||defined(PHP_WIN32) || 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 5846aaaf13..762a1bda7e 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -244,7 +244,7 @@ static char *php_gethostbyname(char *name) } /* }}} */ -#if defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) +#if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || 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,7 +942,8 @@ PHP_FUNCTION(dns_get_mx) } /* }}} */ #endif /* HAVE_DN_SKIPNAME && HAVE_DN_EXPAND */ -#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) */ + +#endif /* HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE)) */ /* * Local variables: diff --git a/ext/standard/dns.h b/ext/standard/dns.h index fddc089ec0..fa006e7947 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 defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(NETWARE))) +#if HAVE_RES_SEARCH && !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE)) PHP_FUNCTION(dns_check_record); # if HAVE_DN_SKIPNAME && HAVE_DN_EXPAND PHP_FUNCTION(dns_get_mx); |