summaryrefslogtreecommitdiff
path: root/ext/pcntl/php_signal.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
committerAnatol Belski <ab@php.net>2014-12-18 10:09:02 +0100
commit4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch)
treec9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/pcntl/php_signal.c
parent79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff)
parentdec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff)
downloadphp-git-POST_NATIVE_TLS_MERGE.tar.gz
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/pcntl/php_signal.c')
-rw-r--r--ext/pcntl/php_signal.c3
1 files changed, 1 insertions, 2 deletions
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