Fixed ZTS build

dstogov · dstogov · commit f0b459b7c41b · 2012-12-25T13:38:14.000+04:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -3806,7 +3806,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args,`
`3806`	`3806`	`}`
`3807`	`3807`
`3808`	`3808`	`lcname = zend_str_tolower_dup(alias->alias, alias->alias_len);`
`3809`		`- zend_add_trait_method(ce, alias->alias, lcname, alias->alias_len+1, &fn_copy, overriden TSRMLS_DC);`
	`3809`	`+ zend_add_trait_method(ce, alias->alias, lcname, alias->alias_len+1, &fn_copy, overriden TSRMLS_CC);`
`3810`	`3810`	`efree(lcname);`
`3811`	`3811`
`3812`	`3812`	`/* 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,`
`3848`	`3848`	`}`
`3849`	`3849`	`}`
`3850`	`3850`
`3851`		`- zend_add_trait_method(ce, fn->common.function_name, lcname, fnname_len+1, &fn_copy, overriden TSRMLS_DC);`
	`3851`	`+ zend_add_trait_method(ce, fn->common.function_name, lcname, fnname_len+1, &fn_copy, overriden TSRMLS_CC);`
`3852`	`3852`	`}`
`3853`	`3853`
`3854`	`3854`	`efree(lcname);`