diff options
| author | Jani Taskinen <jani@php.net> | 2009-12-18 11:02:07 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-12-18 11:02:07 +0000 |
| commit | 52f83608d80a41435a14f93d3d4ce6ce57b010f7 (patch) | |
| tree | 3b9c84b06b6e6b03e6bc54da2a6eaf0b23747f78 | |
| parent | dea1d412e1c126b18cca147f8d025cd135a766c4 (diff) | |
| download | php-git-52f83608d80a41435a14f93d3d4ce6ce57b010f7.tar.gz | |
- 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
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | ext/standard/dns.c | 3 |
3 files changed, 2 insertions, 4 deletions
@@ -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 2aa4ffdcc2..bbf236523f 100644 --- 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 da036ab087..30ffdd6dc5 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 |