From: Scott MacVicar <scottmac@php.net>
Date: Thu, 6 Aug 2009 14:07:16 +0000 (+0000)
Subject: Merge r286857: Change dns.h to php_dns.h, part of my dns cleanup
X-Git-Tag: php-5.2.11RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d78ad0f01bb966fb69b604ae0e3d6c62056c4be;p=php

Merge r286857: Change dns.h to php_dns.h, part of my dns cleanup
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index db1d800eb5..17f1c649f8 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -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
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 743155fffa..56848f9ed8 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -309,7 +309,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)
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 762a1bda7e..02a7a07962 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -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
diff --git a/ext/standard/dns.h b/ext/standard/php_dns.h
similarity index 96%
rename from ext/standard/dns.h
rename to ext/standard/php_dns.h
index fa006e7947..889c167856 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_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
 #define HAVE_DNS_FUNCS 1
@@ -51,4 +51,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 ffa4bf7675..47576eea97 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 "reg.h"
 #include "php_mail.h"
 #include "md5.h"