com php-src: Fixed ZTS build: Zend/zend_compile.c
| From: | Dmitry Stogov | Date: | Tue, 25 Dec 2012 09:38:14 +0000 |
| Subject: | com php-src: Fixed ZTS build: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70814@lists.php.net to get a copy of this message | ||
Commit: f0b459b7c41b392c0958f0f8149980a95bce69fb
Author: Dmitry Stogov <dmitry@zend.com> Tue, 25 Dec 2012 13:38:14 +0400
Parents: 3f8c729e693c432b438cd33679182260d8732e30
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f0b459b7c41b392c0958f0f8149980a95bce69fb
Log:
Fixed ZTS build
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index d0c74fa..0a3850c 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3806,7 +3806,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. */
@@ -3848,7 +3848,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);