diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 13:39:02 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 13:39:02 +0400 |
| commit | 016f3c86103b30520317d8a1740fdb9b8c28df0a (patch) | |
| tree | c30e4eb4f45bef7d96b32aa3c7ffb4e7fcba1206 | |
| parent | bc0425c02579dbbb9e9f9f38a835413c6c512eb3 (diff) | |
| parent | f0b459b7c41b392c0958f0f8149980a95bce69fb (diff) | |
| download | php-git-016f3c86103b30520317d8a1740fdb9b8c28df0a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed ZTS build
| -rw-r--r-- | Zend/zend_compile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 0d9fb17ab0..4d6d18cd4f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3948,7 +3948,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args, } lcname = zend_str_tolower_dup(alias->alias, alias->alias_len); - zend_add_trait_method(ce, alias->alias, lcname, alias->alias_len+1, &fn_copy, overriden TSRMLS_DC); + zend_add_trait_method(ce, alias->alias, lcname, alias->alias_len+1, &fn_copy, overriden TSRMLS_CC); efree(lcname); /* Record the trait from which this alias was resolved. */ @@ -3990,7 +3990,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args, } } - zend_add_trait_method(ce, fn->common.function_name, lcname, fnname_len+1, &fn_copy, overriden TSRMLS_DC); + zend_add_trait_method(ce, fn->common.function_name, lcname, fnname_len+1, &fn_copy, overriden TSRMLS_CC); } efree(lcname); |