svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/configure.in branches/PHP_5_2/ext/standard/dns.c branches/PHP_5_3/NEWS
branches/PHP_5_3/configure.in branches/PHP_5_3/ext/standard/dns.c trunk/configure.in trunk/ext/standard/dns.c

jani Fri, 18 Dec 2009 11:02:07 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292283 Log: - 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 Bug: http://bugs.php.net/50508 (Feedback) Conflicting HEADER type declarations Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/configure.in U php/php-src/branches/PHP_5_2/ext/standard/dns.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/configure.in U php/php-src/branches/PHP_5_3/ext/standard/dns.c U php/php-src/trunk/configure.in U php/php-src/trunk/ext/standard/dns.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-12-18 09:17:04 UTC (rev 292282) +++ php/php-src/branches/PHP_5_2/NEWS 2009-12-18 11:02:07 UTC (rev 292283) @@ -3,6 +3,10 @@ ?? ??? 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) Modified: php/php-src/branches/PHP_5_2/configure.in =================================================================== --- php/php-src/branches/PHP_5_2/configure.in 2009-12-18 09:17:04 UTC (rev 292282) +++ php/php-src/branches/PHP_5_2/configure.in 2009-12-18 11:02:07 UTC (rev 292283) @@ -378,7 +378,6 @@ netinet/in.h \ alloca.h \ arpa/inet.h \ -arpa/nameser_compat.h \ arpa/nameser.h \ assert.h \ crypt.h \ Modified: php/php-src/branches/PHP_5_2/ext/standard/dns.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-12-18 09:17:04 UTC (rev 292282) +++ php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-12-18 11:02:07 UTC (rev 292283) @@ -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 Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-12-18 09:17:04 UTC (rev 292282) +++ php/php-src/branches/PHP_5_3/NEWS 2009-12-18 11:02:07 UTC (rev 292283) @@ -35,6 +35,8 @@ - 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). Modified: php/php-src/branches/PHP_5_3/configure.in =================================================================== --- php/php-src/branches/PHP_5_3/configure.in 2009-12-18 09:17:04 UTC (rev 292282) +++ php/php-src/branches/PHP_5_3/configure.in 2009-12-18 11:02:07 UTC (rev 292283) @@ -411,7 +411,6 @@ netinet/in.h \ alloca.h \ arpa/inet.h \ -arpa/nameser_compat.h \ arpa/nameser.h \ assert.h \ crypt.h \ Modified: php/php-src/branches/PHP_5_3/ext/standard/dns.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-12-18 09:17:04 UTC (rev 292282) +++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-12-18 11:02:07 UTC (rev 292283) @@ -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 Modified: php/php-src/trunk/configure.in =================================================================== --- php/php-src/trunk/configure.in 2009-12-18 09:17:04 UTC (rev 292282) +++ php/php-src/trunk/configure.in 2009-12-18 11:02:07 UTC (rev 292283) @@ -414,7 +414,6 @@ netinet/in.h \ alloca.h \ arpa/inet.h \ -arpa/nameser_compat.h \ arpa/nameser.h \ assert.h \ crypt.h \ Modified: php/php-src/trunk/ext/standard/dns.c =================================================================== --- php/php-src/trunk/ext/standard/dns.c 2009-12-18 09:17:04 UTC (rev 292282) +++ php/php-src/trunk/ext/standard/dns.c 2009-12-18 11:02:07 UTC (rev 292283) @@ -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