]> granicus.if.org Git - php/commitdiff
- Fixed bug #50508 (compile fails: Conflicting HEADER type declarations)
authorJani Taskinen <jani@php.net>
Fri, 18 Dec 2009 11:02:07 +0000 (11:02 +0000)
committerJani Taskinen <jani@php.net>
Fri, 18 Dec 2009 11:02:07 +0000 (11:02 +0000)
# NEVER ever include nameser_compat.h, it's included in various ways in different OSes by nameser.h if needed

configure.in
ext/standard/dns.c

index 8c1870a3f8498d67c110fe48bd67114092d8d948..7634361e643c1b028095d8828f82d9c8c3538f68 100644 (file)
@@ -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 \
index a93ae40ce8aca2e879307681918ace19cb3caa3b..65374948000eff36ac54f2629a8802c8ba1351d3 100644 (file)
@@ -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