diff options
| author | Anatol Belski <ab@php.net> | 2014-09-26 21:24:41 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-26 21:24:41 +0200 |
| commit | 8f0301ddf644d95bf06d5bf0bd9b079e880878fd (patch) | |
| tree | 79c9eb918d7ce778a0733f98a06e59270f716fbf | |
| parent | f7e09105d86009511b1d700d38c5745f3bb9e90b (diff) | |
| download | php-git-8f0301ddf644d95bf06d5bf0bd9b079e880878fd.tar.gz | |
cleanup TSRMLS_FETCH in ext/pcntl
| -rw-r--r-- | ext/pcntl/pcntl.c | 2 | ||||
| -rw-r--r-- | ext/pcntl/php_signal.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c index 11ad1018ec..0086b383b9 100644 --- a/ext/pcntl/pcntl.c +++ b/ext/pcntl/pcntl.c @@ -1191,7 +1191,6 @@ PHP_FUNCTION(pcntl_strerror) static void pcntl_signal_handler(int signo) { struct php_pcntl_pending_signal *psig; - TSRMLS_FETCH(); psig = PCNTL_G(spares); if (!psig) { @@ -1219,7 +1218,6 @@ void pcntl_signal_dispatch() struct php_pcntl_pending_signal *queue, *next; sigset_t mask; sigset_t old_mask; - TSRMLS_FETCH(); /* Mask all signals */ sigfillset(&mask); 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); |