diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /Zend/zend_signal.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'Zend/zend_signal.h')
| -rw-r--r-- | Zend/zend_signal.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h index 02d6495437..2f33ccb5b7 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -65,17 +65,17 @@ typedef struct _zend_signal_globals_t { } zend_signal_globals_t; #ifdef ZTS -# define SIGG(v) TSRMG(zend_signal_globals_id, zend_signal_globals_t *, v) +# define SIGG(v) ZEND_TSRMG(zend_signal_globals_id, zend_signal_globals_t *, v) BEGIN_EXTERN_C() ZEND_API extern int zend_signal_globals_id; END_EXTERN_C() # define ZEND_SIGNAL_BLOCK_INTERRUPUTIONS() if (EXPECTED(zend_signal_globals_id)) { SIGG(depth)++; } -# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (EXPECTED(zend_signal_globals_id) && UNEXPECTED((--SIGG(depth))==SIGG(blocked))) { zend_signal_handler_unblock(TSRMLS_C); } +# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (EXPECTED(zend_signal_globals_id) && UNEXPECTED((--SIGG(depth))==SIGG(blocked))) { zend_signal_handler_unblock(); } #else /* ZTS */ # define SIGG(v) (zend_signal_globals.v) extern ZEND_API zend_signal_globals_t zend_signal_globals; # define ZEND_SIGNAL_BLOCK_INTERRUPUTIONS() SIGG(depth)++; -# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (UNEXPECTED((--SIGG(depth))==SIGG(blocked))) { zend_signal_handler_unblock(TSRMLS_C); } +# define ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() if (UNEXPECTED((--SIGG(depth))==SIGG(blocked))) { zend_signal_handler_unblock(); } #endif /* not ZTS */ # define SIGNAL_BEGIN_CRITICAL() sigset_t oldmask; \ @@ -84,12 +84,12 @@ extern ZEND_API zend_signal_globals_t zend_signal_globals; void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context); ZEND_API void zend_signal_handler_unblock(); -void zend_signal_activate(TSRMLS_D); -void zend_signal_deactivate(TSRMLS_D); +void zend_signal_activate(void); +void zend_signal_deactivate(void); void zend_signal_startup(); -void zend_signal_shutdown(TSRMLS_D); -ZEND_API int zend_signal(int signo, void (*handler)(int) TSRMLS_DC); -ZEND_API int zend_sigaction(int signo, const struct sigaction *act, struct sigaction *oldact TSRMLS_DC); +void zend_signal_shutdown(void); +ZEND_API int zend_signal(int signo, void (*handler)(int)); +ZEND_API int zend_sigaction(int signo, const struct sigaction *act, struct sigaction *oldact); #ifdef ZTS #define zend_sigprocmask(signo, set, oldset) tsrm_sigmask((signo), (set), (oldset)) |