From 8f0301ddf644d95bf06d5bf0bd9b079e880878fd Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Fri, 26 Sep 2014 21:24:41 +0200 Subject: cleanup TSRMLS_FETCH in ext/pcntl --- ext/pcntl/php_signal.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'ext/pcntl/php_signal.c') diff --git a/ext/pcntl/php_signal.c b/ext/pcntl/php_signal.c index aa2139342c..f19c8a9a25 100644 --- a/ext/pcntl/php_signal.c +++ b/ext/pcntl/php_signal.c @@ -28,9 +28,7 @@ Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all) { struct sigaction act,oact; -#ifdef ZEND_SIGNALS - TSRMLS_FETCH(); -#endif + act.sa_handler = func; if (mask_all) { sigfillset(&act.sa_mask); -- cgit v1.2.1 From c00424e427930a33e6d8645cc3f23fb78ed29b9f Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 15 Oct 2014 09:37:55 +0200 Subject: bring back all the TSRMLS_FETCH() stuff for better comparability with the mainstream --- ext/pcntl/php_signal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ext/pcntl/php_signal.c') diff --git a/ext/pcntl/php_signal.c b/ext/pcntl/php_signal.c index f19c8a9a25..aa2139342c 100644 --- a/ext/pcntl/php_signal.c +++ b/ext/pcntl/php_signal.c @@ -28,7 +28,9 @@ Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all) { struct sigaction act,oact; - +#ifdef ZEND_SIGNALS + TSRMLS_FETCH(); +#endif act.sa_handler = func; if (mask_all) { sigfillset(&act.sa_mask); -- cgit v1.2.1 From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- ext/pcntl/php_signal.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ext/pcntl/php_signal.c') diff --git a/ext/pcntl/php_signal.c b/ext/pcntl/php_signal.c index aa2139342c..4090fe6fb9 100644 --- a/ext/pcntl/php_signal.c +++ b/ext/pcntl/php_signal.c @@ -29,7 +29,6 @@ Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all) { struct sigaction act,oact; #ifdef ZEND_SIGNALS - TSRMLS_FETCH(); #endif act.sa_handler = func; if (mask_all) { @@ -48,7 +47,7 @@ Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all) #endif } #ifdef ZEND_SIGNALS - if (zend_sigaction(signo, &act, &oact TSRMLS_CC) < 0) + if (zend_sigaction(signo, &act, &oact) < 0) #else if (sigaction(signo, &act, &oact) < 0) #endif -- cgit v1.2.1