kalle Wed Jun 3 08:59:19 2009 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/main/streams cast.c Log: Fixed #48448 (Compile failure under IRIX 6.5.30 building cast.c) # Only in this branch, looks like a missing merge compared to PHP_5_3/HEAD http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1539&r2=1.2027.2.547.2.1540&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1539 php-src/NEWS:1.2027.2.547.2.1540 --- php-src/NEWS:1.2027.2.547.2.1539 Tue Jun 2 19:55:07 2009 +++ php-src/NEWS Wed Jun 3 08:59:19 2009 @@ -1,10 +1,12 @@ -PHP NEWS +PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Jun 2009, PHP 5.2.10 - Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara) - Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4). (Jani, spisek at kerio dot com) +- Fixed bug #48448 (Compile failure under IRIX 6.5.30 building cast.c). + (Kalle) - Fixed bug #48434 (memory_get_usage() accuracy). (Arnaud) - Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory usage). (Scott) http://cvs.php.net/viewvc.cgi/php-src/main/streams/cast.c?r1=1.12.2.1.2.5&r2=1.12.2.1.2.6&diff_format=u Index: php-src/main/streams/cast.c diff -u php-src/main/streams/cast.c:1.12.2.1.2.5 php-src/main/streams/cast.c:1.12.2.1.2.6 --- php-src/main/streams/cast.c:1.12.2.1.2.5 Sun Apr 19 17:10:52 2009 +++ php-src/main/streams/cast.c Wed Jun 3 08:59:19 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cast.c,v 1.12.2.1.2.5 2009/04/19 17:10:52 lbarnaud Exp $ */ +/* $Id: cast.c,v 1.12.2.1.2.6 2009/06/03 08:59:19 kalle Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -219,7 +219,7 @@ if (ret != SUCCESS) { php_stream_close(newstream); } else { - int retcode = php_stream_cast(newstream, castas | flags, ret, show_err); + int retcode = php_stream_cast(newstream, castas | flags, (void **)ret, show_err); if (retcode == SUCCESS) rewind(*(FILE**)ret);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php