From 76081df168829a5cc0409fac47c217d4927ec6f6 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 1 Oct 2014 22:04:21 +0200 Subject: using pointer to the tsrm ls cache instead of a function call yet another approach --- Zend/zend_signal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zend/zend_signal.h') diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h index 02d6495437..8e99a50bbb 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -65,7 +65,7 @@ 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() -- 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 --- Zend/zend_signal.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Zend/zend_signal.h') diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h index 8e99a50bbb..2f33ccb5b7 100644 --- a/Zend/zend_signal.h +++ b/Zend/zend_signal.h @@ -70,12 +70,12 @@ 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)) -- cgit v1.2.1