mirror of
https://github.com/php/php-src.git
synced 2025-01-10 04:54:47 +08:00
Change dns.h to php_dns.h, part of my dns cleanup
This commit is contained in:
parent
ac4292ff0b
commit
80d7dee7d6
@ -423,10 +423,11 @@ sys/time.h \
|
||||
netinet/in.h \
|
||||
alloca.h \
|
||||
arpa/inet.h \
|
||||
arpa/nameser.h \
|
||||
arpa/nameser_compat.h \
|
||||
arpa/nameser.h \
|
||||
assert.h \
|
||||
crypt.h \
|
||||
dns.h \
|
||||
fcntl.h \
|
||||
grp.h \
|
||||
ieeefp.h \
|
||||
|
@ -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"
|
||||
|
||||
#ifdef PHP_WIN32
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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 */
|
||||
|
||||
|
@ -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 */
|
@ -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"
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Generated by re2c 0.13.5 on Mon Jul 27 02:20:36 2009 */
|
||||
/* Generated by re2c 0.13.5 on Wed Aug 5 23:53:08 2009 */
|
||||
#line 1 "ext/standard/url_scanner_ex.re"
|
||||
/*
|
||||
+----------------------------------------------------------------------+
|
||||
|
Loading…
Reference in New Issue
Block a user