From: Jani Taskinen <jani@php.net>
Date: Fri, 18 Dec 2009 11:02:07 +0000 (+0000)
Subject: - Fixed bug #50508 (compile fails: Conflicting HEADER type declarations)
X-Git-Tag: php-5.4.0alpha1~191^2~2198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17cebc44a7a4470cd06ba715919ab144d08b9228;p=php

- 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/configure.in b/configure.in
index 8c1870a3f8..7634361e64 100644
--- a/configure.in
+++ b/configure.in
@@ -414,7 +414,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 a93ae40ce8..6537494800 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -46,9 +46,6 @@
 #if HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
 #endif
-#if HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
 #if HAVE_RESOLV_H
 #include <resolv.h>
 #endif