Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE

1 files changed, 8 insertions, 8 deletions

diff --git a/main/php_ticks.c b/main/php_ticks.c
index daa6cde6ff..0c7c0d2f1f 100644
--- a/main/php_ticks.c
+++ b/main/php_ticks.c
@@ -21,18 +21,18 @@
 #include "php.h"
 #include "php_ticks.h"
 
-int php_startup_ticks(TSRMLS_D)
+int php_startup_ticks(void)
 {
 	zend_llist_init(&PG(tick_functions), sizeof(void(*)(int)), NULL, 1);
 	return SUCCESS;
 }
 
-void php_deactivate_ticks(TSRMLS_D)
+void php_deactivate_ticks(void)
 {
 	zend_llist_clean(&PG(tick_functions));
 }
 
-void php_shutdown_ticks(TSRMLS_D)
+void php_shutdown_ticks(void)
 {
 	zend_llist_destroy(&PG(tick_functions));
 }
@@ -46,18 +46,18 @@ static int php_compare_tick_functions(void *elem1, void *elem2)
 	return (func1 == func2);
 }
 
-PHPAPI void php_add_tick_function(void (*func)(int) TSRMLS_DC)
+PHPAPI void php_add_tick_function(void (*func)(int))
 {
 	zend_llist_add_element(&PG(tick_functions), (void *)&func);
 }
 
-PHPAPI void php_remove_tick_function(void (*func)(int) TSRMLS_DC)
+PHPAPI void php_remove_tick_function(void (*func)(int))
 {
 	zend_llist_del_element(&PG(tick_functions), (void *)func,
 						   (int(*)(void*, void*))php_compare_tick_functions);
 }
 
-static void php_tick_iterator(void *data, void *arg TSRMLS_DC)
+static void php_tick_iterator(void *data, void *arg)
 {
 	void (*func)(int);
 
@@ -65,9 +65,9 @@ static void php_tick_iterator(void *data, void *arg TSRMLS_DC)
 	func(*((int *)arg));
 }
 
-void php_run_ticks(int count TSRMLS_DC)
+void php_run_ticks(int count)
 {
-	zend_llist_apply_with_argument(&PG(tick_functions), (llist_apply_with_arg_func_t) php_tick_iterator, &count TSRMLS_CC);
+	zend_llist_apply_with_argument(&PG(tick_functions), (llist_apply_with_arg_func_t) php_tick_iterator, &count);
 }
 
 /*