com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/intl/ converter/converter.c

From: Date: Mon, 17 Mar 2014 09:37:46 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport: ext/intl/ converter/converter.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76505@lists.php.net to get a copy of this message
Commit: 300a8df8f44b1a76a77d3ca434b7a4bef052390a Author: Anatol Belski <ab@php.net> Mon, 17 Mar 2014 10:37:46 +0100 Parents: 78fef11fe52fab912ca9fb1603bb78019c8db833 2499b6518c4b0112c79295145d5f09d3658c31f4 Branches: str_size_and_int64_56_backport Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=300a8df8f44b1a76a77d3ca434b7a4bef052390a Log: Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport * origin/PHP-5.6: Fix bug #66873: check if obj->src is set updated NEWS updated to oniguruma to 5.9.5 Conflicts: ext/intl/converter/converter.c Bugs: https://bugs..php.net/66873 Changed paths: MM ext/intl/converter/converter.c Diff: diff --cc ext/intl/converter/converter.c index 3d83fda,a3381bf..abee189 --- a/ext/intl/converter/converter.c +++ b/ext/intl/converter/converter.c @@@ -56,7 -56,9 +56,9 @@@ static inline void php_converter_throw_ /* }}} */ /* {{{ php_converter_default_callback */ -static void php_converter_default_callback(zval *return_value, zval *zobj, long reason, zval *error TSRMLS_DC) { +static void php_converter_default_callback(zval *return_value, zval *zobj, php_int_t reason, zval *error TSRMLS_DC) { + zval_dtor(error); - ZVAL_LONG(error, U_ZERO_ERROR); ++ ZVAL_INT(error, U_ZERO_ERROR); /* Basic functionality so children can call parent::toUCallback() */ switch (reason) { case UCNV_UNASSIGNED:

« previous php.cvs (#76505) next »