- Fixed bug #50508 (compile fails: Conflicting HEADER type declarations)

# NEVER ever include nameser_compat.h, it's included in various ways in different OSes by nameser.h if needed

diff --git a/NEWS b/NEWS
index 72d4b026398a4eb353953bc7452124a76b57fac4..9fdb61fa0ed5d3c28496a14a3408a014863ea385 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ PHP                                                                        NEWS
 ?? ??? 2010, PHP 5.2.13
 - Fixed build of mysqli with MySQL 5.5.0-m2. (Andrey)
 
+- Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
+  (Jani)
+
+
 17 Dec 2009, PHP 5.2.12
 - Updated timezone database to version 2009.19 (2009s). (Derick)
 

diff --git a/configure.in b/configure.in
index 167ff19678779fbd0c69576e677d8d87cc7ace9a..b688c0119c39269bdadcb7693da4bd801de9bc52 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -378,7 +378,6 @@ sys/time.h \
 netinet/in.h \
 alloca.h \
 arpa/inet.h \
-arpa/nameser_compat.h \
 arpa/nameser.h \
 assert.h \
 crypt.h \

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index bc6e888ec034bd718c8960f6794299c97ff604d5..1401785094b191b4ccecd4151fe0e364f08ec952 100644 (file)
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -34,14 +34,14 @@
 #endif
 /* located in www.php.net/extra/bindlib.zip */
 #if HAVE_ARPA_INET_H 
-#include "arpa/inet.h"
+#include <arpa/inet.h>
 #endif
-#include "netdb.h"
+#include <netdb.h>
 #if HAVE_ARPA_NAMESERV_H
-#include "arpa/nameser.h"
+#include <arpa/nameser.h>
 #endif
 #if HAVE_RESOLV_H
-#include "resolv.h"
+#include <resolv.h>
 #endif
 #endif /* HAVE_LIBBIND */
 #include <winsock2.h>
@@ -55,9 +55,6 @@
 #undef STATUS
 #undef T_UNSPEC
 #endif
-#if HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
 #if HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
 #endif