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

jani Mon, 21 Dec 2009 15:22:40 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292413 Log: - Tune the fix for bug #50508 and make it work with MacOSX, bug #50541. Bugs: http://bugs.php.net/50508 (Closed) Conflicting HEADER type declarations http://bugs.php.net/50541 (Bogus) Missing HEADER definition Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/dns.c U php/php-src/branches/PHP_5_3/ext/standard/dns.c U php/php-src/trunk/ext/standard/dns.c 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-21 14:04:56 UTC (rev 292412) +++ php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-12-21 15:22:40 UTC (rev 292413) @@ -56,6 +56,9 @@ #undef T_UNSPEC #endif #if HAVE_ARPA_NAMESER_H +#ifdef DARWIN +# define BIND_8_COMPAT 1 +#endif #include <arpa/nameser.h> #endif #if HAVE_RESOLV_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-21 14:04:56 UTC (rev 292412) +++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2009-12-21 15:22:40 UTC (rev 292413) @@ -44,6 +44,9 @@ #undef T_UNSPEC #endif #if HAVE_ARPA_NAMESER_H +#ifdef DARWIN +# define BIND_8_COMPAT 1 +#endif #include <arpa/nameser.h> #endif #if HAVE_RESOLV_H Modified: php/php-src/trunk/ext/standard/dns.c =================================================================== --- php/php-src/trunk/ext/standard/dns.c 2009-12-21 14:04:56 UTC (rev 292412) +++ php/php-src/trunk/ext/standard/dns.c 2009-12-21 15:22:40 UTC (rev 292413) @@ -44,6 +44,9 @@ #undef T_UNSPEC #endif #if HAVE_ARPA_NAMESER_H +#ifdef DARWIN +# define BIND_8_COMPAT 1 +#endif #include <arpa/nameser.h> #endif #if HAVE_RESOLV_H