com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_e xecute_API.c

From: Date: Tue, 10 Jun 2014 13:58:16 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_e xecute_API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78814@lists.php.net to get a copy of this message
Commit: ebe6854dbc1c61b303f5adbec712741b1bdcae70 Author: Xinchen Hui <laruence@php.net> Tue, 10 Jun 2014 21:58:16 +0800 Parents: e72ab7919678d4f0913204f25fc93166ddb69cf4 e8699d75da9d3b0cc16b9454f12928defb6e72fc Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ebe6854dbc1c61b303f5adbec712741b1bdcae70 Log: Merge branch 'PHP-5.5' into PHP-5.6 Conflicts: Zend/zend_execute_API.c Changed paths: MM Zend/zend_execute_API.c Diff: diff --cc Zend/zend_execute_API.c index c9de6b9,e100484..af32e91 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@@ -449,9 -448,7 +449,7 @@@ ZEND_API int zend_is_true(zval *op) /* } /* }}} */ - #include "../TSRM/tsrm_strtok_r.h" - -#define IS_VISITED_CONSTANT IS_CONSTANT_INDEX +#define IS_VISITED_CONSTANT 0x80 #define IS_CONSTANT_VISITED(p) (Z_TYPE_P(p) & IS_VISITED_CONSTANT) #define Z_REAL_TYPE_P(p) (Z_TYPE_P(p) & ~IS_VISITED_CONSTANT) #define MARK_CONSTANT_VISITED(p) Z_TYPE_P(p) |= IS_VISITED_CONSTANT

« previous php.cvs (#78814) next »