- 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 c51abd9ea761bb547a5778d804c4fd2aa07c832e..673427faef4cb6c83692c0c5e993633d08d1c87e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,8 @@ PHP                                                                        NEWS
 - Fixed memory leak in extension loading when an error occurs on Windows.
   (Pierre)
 
+- Fixed bug #50508 (compile failure: Conflicting HEADER type declarations).
+  (Jani)
 - Fixed bug #50496 (Use of <stdbool.h> is valid only in a c99 compilation 
   environment. (Sriram)
 - Fixed bug #50464 (declare encoding doesn't work within an included file).

diff --git a/configure.in b/configure.in
index 2aa4ffdcc2befdc2e265e24c1334c9e2f0b912ec..bbf236523f3149b2cb0dd600cf0416797d555494 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -411,7 +411,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 da036ab087de5475bda745584ab80868d78cea35..30ffdd6dc5adb097cc25466e4a03aef4c118ada6 100644 (file)
--- 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