dsp Fri, 15 Jul 2011 15:25:24 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313267
Log: Fix #55212. Only declare STREAM_PF_INET6 if PHP is compiled with IPv6 support Bug: https://bugs.php.net/55212 (Open) Detect whether IPv6 is enabled with STREAM_PF_INET6 Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/file.c U php/php-src/trunk/ext/standard/file.c Modified: php/php-src/branches/PHP_5_4/ext/standard/file.c =================================================================== --- php/php-src/branches/PHP_5_4/ext/standard/file.c 2011-07-15 14:43:56 UTC (rev 313266) +++ php/php-src/branches/PHP_5_4/ext/standard/file.c 2011-07-15 15:25:24 UTC (rev 313267) @@ -236,10 +236,12 @@ REGISTER_LONG_CONSTANT("STREAM_PF_INET", AF_INET, CONST_CS|CONST_PERSISTENT); #endif -#ifdef PF_INET6 +#if HAVE_IPV6 +# ifdef PF_INET6 REGISTER_LONG_CONSTANT("STREAM_PF_INET6", PF_INET6, CONST_CS|CONST_PERSISTENT); -#elif defined(AF_INET6) +# elif defined(AF_INET6) REGISTER_LONG_CONSTANT("STREAM_PF_INET6", AF_INET6, CONST_CS|CONST_PERSISTENT); +# endif #endif #ifdef PF_UNIX Modified: php/php-src/trunk/ext/standard/file.c =================================================================== --- php/php-src/trunk/ext/standard/file.c 2011-07-15 14:43:56 UTC (rev 313266) +++ php/php-src/trunk/ext/standard/file.c 2011-07-15 15:25:24 UTC (rev 313267) @@ -236,10 +236,12 @@ REGISTER_LONG_CONSTANT("STREAM_PF_INET", AF_INET, CONST_CS|CONST_PERSISTENT); #endif -#ifdef PF_INET6 +#if HAVE_IPV6 +# ifdef PF_INET6 REGISTER_LONG_CONSTANT("STREAM_PF_INET6", PF_INET6, CONST_CS|CONST_PERSISTENT); -#elif defined(AF_INET6) +# elif defined(AF_INET6) REGISTER_LONG_CONSTANT("STREAM_PF_INET6", AF_INET6, CONST_CS|CONST_PERSISTENT); +# endif #endif #ifdef PF_UNIX
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
