diff options
| author | Scott MacVicar <scottmac@php.net> | 2009-08-05 23:20:17 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2009-08-05 23:20:17 +0000 |
| commit | af5df4c813bd32d58ed4510a4cb0da2f516e5a5d (patch) | |
| tree | bedfc028049797119ef56e4510168ca713293a76 /ext | |
| parent | d46ca6d3b59668eb3ac0d6cf87a4252717dd6919 (diff) | |
| download | php-git-af5df4c813bd32d58ed4510a4cb0da2f516e5a5d.tar.gz | |
Change dns.h to php_dns.h, part of my dns cleanup
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/config.m4 | 4 | ||||
| -rw-r--r-- | ext/standard/dns.c | 2 | ||||
| -rw-r--r-- | ext/standard/dns_win32.c | 2 | ||||
| -rw-r--r-- | ext/standard/php_dns.h (renamed from ext/standard/dns.h) | 6 | ||||
| -rw-r--r-- | ext/standard/php_standard.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 115d2adc9d..342fe3aae3 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -32,7 +32,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" #include "safe_mode.h" diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 0e0244c001..8b793c619b 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -247,7 +247,7 @@ fi 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) @@ -257,7 +257,7 @@ PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket) dnl dnl These are old deprecated functions, a single define of HAVE_DEPRECATED_DNS_FUNCS -dnl will be set in ext/standard/dns.h +dnl will be set in ext/standard/php_dns.h dnl PHP_CHECK_FUNC(res_mkquery, resolv, bind, socket) diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 8e3d50290f..637c156e07 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -56,7 +56,7 @@ #define AF_INET 2 /* internetwork: UDP, TCP, etc. */ #endif -#include "dns.h" +#include "php_dns.h" /* type compat */ #ifndef DNS_T_A diff --git a/ext/standard/dns_win32.c b/ext/standard/dns_win32.c index a78405df62..2779220ecb 100644 --- a/ext/standard/dns_win32.c +++ b/ext/standard/dns_win32.c @@ -22,7 +22,7 @@ #include <Winbase.h > #include <Windns.h> -#include "dns.h" +#include "php_dns.h" #define PHP_DNS_NUM_TYPES 12 /* Number of DNS Types Supported by PHP currently */ diff --git a/ext/standard/dns.h b/ext/standard/php_dns.h index bdb4c9f3d6..8790d2b4ac 100644 --- a/ext/standard/dns.h +++ b/ext/standard/php_dns.h @@ -20,8 +20,8 @@ /* $Id$ */ -#ifndef DNS_H -#define DNS_H +#ifndef PHP_DNS_H +#define PHP_DNS_H #if HAVE_RES_MKQUERY && !defined(HAVE_RES_NMKQUERY) && HAVE_RES_SEND && !defined(HAVE_RES_NSEND) #define HAVE_DEPRECATED_DNS_FUNCS 1 @@ -68,4 +68,4 @@ PHP_MINIT_FUNCTION(dns); #define INT32SZ 4 #endif -#endif /* DNS_H */ +#endif /* PHP_DNS_H */ diff --git a/ext/standard/php_standard.h b/ext/standard/php_standard.h index b1ee04727d..f9919e0e29 100644 --- a/ext/standard/php_standard.h +++ b/ext/standard/php_standard.h @@ -23,7 +23,7 @@ #include "php_string.h" #include "base64.h" #include "php_dir.h" -#include "dns.h" +#include "php_dns.h" #include "php_mail.h" #include "md5.h" #include "sha1.h" |