summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-04-01 23:43:33 -0700
committerStanislav Malyshev <stas@php.net>2015-04-01 23:43:33 -0700
commitcaecd88237f260c78428feb0acc6578618fa231b (patch)
tree10270176584f8c4b83ada6f06765847ea429308c
parent75f40ae1f3a7ca837d230f099627d121f9b3a32f (diff)
downloadphp-git-caecd88237f260c78428feb0acc6578618fa231b.tar.gz
Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
This reverts commit fe0ca2745f00940a27bfc8e87db534541a19af70, reversing changes made to 968fbc6acf0bc27be17c0209be7f966e89a55943.
-rw-r--r--Zend/zend_API.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 17672ffc99..84acfcac88 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -101,7 +101,6 @@ typedef struct _zend_fcall_info_cache {
#define ZEND_ARG_INFO(pass_by_ref, name) { #name, sizeof(#name)-1, NULL, 0, 0, 0, pass_by_ref},
#define ZEND_ARG_PASS_INFO(pass_by_ref) { NULL, 0, NULL, 0, 0, 0, pass_by_ref},
#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name, sizeof(#name)-1, #classname, sizeof(#classname)-1, IS_OBJECT, allow_null, pass_by_ref},
-#define ZEND_ARG_CALLABLE_INFO(pass_by_ref, name, allow_null) { #name, sizeof(#name)-1, NULL, 0, IS_CALLABLE, allow_null, pass_by_ref },
#define ZEND_ARG_ARRAY_INFO(pass_by_ref, name, allow_null) { #name, sizeof(#name)-1, NULL, 0, IS_ARRAY, allow_null, pass_by_ref},
#define ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) { #name, sizeof(#name)-1, NULL, 0, type_hint, allow_null, pass_by_ref},
#define ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, return_reference, required_num_args) \