jani            Wed May 20 12:15:36 2009 UTC

  Modified files:              
    /php-src/ext/standard       dns.c 
  Log:
  - Fix non-windows builds too
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.108&r2=1.109&diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.108 php-src/ext/standard/dns.c:1.109
--- php-src/ext/standard/dns.c:1.108    Wed May 20 08:16:56 2009
+++ php-src/ext/standard/dns.c  Wed May 20 12:15:36 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: dns.c,v 1.108 2009/05/20 08:16:56 kalle Exp $ */
+/* $Id: dns.c,v 1.109 2009/05/20 12:15:36 jani Exp $ */
 
 /* {{{ includes */
 #include "php.h"
@@ -278,7 +278,8 @@
 #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 !defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || 
defined(NETWARE)))
+/* Note: These functions are defined in ext/standard/dns_win32.c for Windows! 
*/
+#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,7 +917,7 @@
 }
 /* }}} */
 #endif /* HAVE_DN_SKIPNAME && HAVE_DN_EXPAND */
-#endif /* defined(PHP_WIN32) || (HAVE_RES_SEARCH && !(defined(__BEOS__) || 
defined(NETWARE))) */
+#endif /* !defined(PHP_WIN32) && (HAVE_RES_SEARCH && !(defined(__BEOS__) || 
defined(NETWARE))) */
 
 #if HAVE_DNS_FUNCS || defined(PHP_WIN32)
 PHP_MINIT_FUNCTION(dns) {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to