summaryrefslogtreecommitdiff
path: root/Zend/zend.h
diff options
context:
space:
mode:
authorChristoph M. Becker <cmb@php.net>2016-06-20 15:43:33 +0200
committerChristoph M. Becker <cmb@php.net>2016-06-20 15:43:33 +0200
commit5408d96716176e90c96ae844a35fcdfc82d2bb1c (patch)
tree10ebf4cfe58f1395fcd1d739a46d1cce7c6e89c1 /Zend/zend.h
parenta291d92067b4610aaf1eb96fa528c7cb316b4d60 (diff)
parentc622cc4446951044dbef419e3ad59fc90eebd3a1 (diff)
downloadphp-git-5408d96716176e90c96ae844a35fcdfc82d2bb1c.tar.gz
Merge branch 'master' of http://git.php.net/repository/php-src
Diffstat (limited to 'Zend/zend.h')
-rw-r--r--Zend/zend.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/Zend/zend.h b/Zend/zend.h
index 8fb2726dcf..1e0a5613e6 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -42,16 +42,8 @@
#include "zend_smart_str_public.h"
#include "zend_signal.h"
-#ifndef ZEND_SIGNALS
-/* block/unblock interruptions callbacks might be used by SAPI, and were used
- * by mod_php for Apache 1, but now they are not usefull anymore.
- */
-# define HANDLE_BLOCK_INTERRUPTIONS()
-# define HANDLE_UNBLOCK_INTERRUPTIONS()
-#else
-# define HANDLE_BLOCK_INTERRUPTIONS() ZEND_SIGNAL_BLOCK_INTERRUPTIONS()
-# define HANDLE_UNBLOCK_INTERRUPTIONS() ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS()
-#endif
+#define HANDLE_BLOCK_INTERRUPTIONS() ZEND_SIGNAL_BLOCK_INTERRUPTIONS()
+#define HANDLE_UNBLOCK_INTERRUPTIONS() ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS()
#define INTERNAL_FUNCTION_PARAMETERS zend_execute_data *execute_data, zval *return_value
#define INTERNAL_FUNCTION_PARAM_PASSTHRU execute_data, return_value