scottmac Thu, 06 Aug 2009 14:07:16 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=286890
Log: Merge r286857: Change dns.h to php_dns.h, part of my dns cleanup Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c U php/php-src/branches/PHP_5_2/ext/standard/config.m4 U php/php-src/branches/PHP_5_2/ext/standard/dns.c D php/php-src/branches/PHP_5_2/ext/standard/dns.h A + php/php-src/branches/PHP_5_2/ext/standard/php_dns.h (from php/php-src/branches/PHP_5_2/ext/standard/dns.h:r286885) U php/php-src/branches/PHP_5_2/ext/standard/php_standard.h Modified: php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c 2009-08-06 13:54:21 UTC (rev 286889) +++ php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c 2009-08-06 14:07:16 UTC (rev 286890) @@ -31,7 +31,7 @@ #include "ext/standard/info.h" #include "ext/session/php_session.h" #include "zend_operators.h" -#include "ext/standard/dns.h" +#include "ext/standard/php_dns.h" #include "ext/standard/php_uuencode.h" #ifdef PHP_WIN32 Modified: php/php-src/branches/PHP_5_2/ext/standard/config.m4 =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/config.m4 2009-08-06 13:54:21 UTC (rev 286889) +++ php/php-src/branches/PHP_5_2/ext/standard/config.m4 2009-08-06 14:07:16 UTC (rev 286890) @@ -309,7 +309,7 @@ dnl dnl Detect library functions needed by php dns_xxx functions -dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS +dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS dnl PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket) PHP_CHECK_FUNC(res_nsend, resolv, bind, socket) Modified: php/php-src/branches/PHP_5_2/ext/standard/dns.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-08-06 13:54:21 UTC (rev 286889) +++ php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-08-06 14:07:16 UTC (rev 286890) @@ -68,7 +68,7 @@ #define AF_INET 2 /* internetwork: UDP, TCP, etc. */ #endif -#include "dns.h" +#include "php_dns.h" /* type compat */ #ifndef DNS_T_A Deleted: php/php-src/branches/PHP_5_2/ext/standard/dns.h =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/dns.h 2009-08-06 13:54:21 UTC (rev 286889) +++ php/php-src/branches/PHP_5_2/ext/standard/dns.h 2009-08-06 14:07:16 UTC (rev 286890) @@ -1,54 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2009 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | lice...@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: The typical suspects | - | Marcus Boerger <he...@php.net> | - | Pollita <poll...@php.net> | - +----------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#ifndef DNS_H -#define DNS_H - -#if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME -#define HAVE_DNS_FUNCS 1 -#endif - -PHP_FUNCTION(gethostbyaddr); -PHP_FUNCTION(gethostbyname); -PHP_FUNCTION(gethostbynamel); - -#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); -# endif - -# if HAVE_DNS_FUNCS -PHP_FUNCTION(dns_get_record); -PHP_MINIT_FUNCTION(dns); -# endif -#endif - -#ifndef INT16SZ -#define INT16SZ 2 -#endif - -#ifndef INT32SZ -#define INT32SZ 4 -#endif - -#endif /* DNS_H */ Copied: php/php-src/branches/PHP_5_2/ext/standard/php_dns.h (from rev 286885, php/php-src/branches/PHP_5_2/ext/standard/dns.h) =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/php_dns.h (rev 0) +++ php/php-src/branches/PHP_5_2/ext/standard/php_dns.h 2009-08-06 14:07:16 UTC (rev 286890) @@ -0,0 +1,54 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 5 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2009 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | http://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | lice...@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Authors: The typical suspects | + | Marcus Boerger <he...@php.net> | + | Pollita <poll...@php.net> | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ + +#ifndef PHP_DNS_H +#define PHP_DNS_H + +#if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME +#define HAVE_DNS_FUNCS 1 +#endif + +PHP_FUNCTION(gethostbyaddr); +PHP_FUNCTION(gethostbyname); +PHP_FUNCTION(gethostbynamel); + +#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); +# endif + +# if HAVE_DNS_FUNCS +PHP_FUNCTION(dns_get_record); +PHP_MINIT_FUNCTION(dns); +# endif +#endif + +#ifndef INT16SZ +#define INT16SZ 2 +#endif + +#ifndef INT32SZ +#define INT32SZ 4 +#endif + +#endif /* PHP_DNS_H */ Modified: php/php-src/branches/PHP_5_2/ext/standard/php_standard.h =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/php_standard.h 2009-08-06 13:54:21 UTC (rev 286889) +++ php/php-src/branches/PHP_5_2/ext/standard/php_standard.h 2009-08-06 14:07:16 UTC (rev 286890) @@ -23,7 +23,7 @@ #include "php_string.h" #include "base64.h" #include "php_dir.h" -#include "dns.h" +#include "php_dns.h" #include "reg.h" #include "php_mail.h" #include "md5.h"
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php