Merge branch 'datibbaw/pow-operator' into PHP-5.6broken-5.6-20140206

1 files changed, 3 insertions, 9 deletions

diff --git a/main/php_ticks.c b/main/php_ticks.c
index b07f925fab..248b5a9e04 100644
--- a/main/php_ticks.c
+++ b/main/php_ticks.c
@@ -46,17 +46,13 @@ static int php_compare_tick_functions(void *elem1, void *elem2)
 	return (func1 == func2);
 }
 
-PHPAPI void php_add_tick_function(void (*func)(int))
+PHPAPI void php_add_tick_function(void (*func)(int) TSRMLS_DC)
 {
-	TSRMLS_FETCH();
-
 	zend_llist_add_element(&PG(tick_functions), (void *)&func);
 }
 
-PHPAPI void php_remove_tick_function(void (*func)(int))
+PHPAPI void php_remove_tick_function(void (*func)(int) TSRMLS_DC)
 {
-	TSRMLS_FETCH();
-
 	zend_llist_del_element(&PG(tick_functions), (void *)func,
 						   (int(*)(void*, void*))php_compare_tick_functions);
 }
@@ -69,10 +65,8 @@ static void php_tick_iterator(void *data, void *arg TSRMLS_DC)
 	func(*((int *)arg));
 }
 
-void php_run_ticks(int count)
+void php_run_ticks(int count TSRMLS_DC)
 {
-	TSRMLS_FETCH();
-
 	zend_llist_apply_with_argument(&PG(tick_functions), (llist_apply_with_arg_func_t) php_tick_iterator, &count TSRMLS_CC);
 }