com php-src: Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4": Zend/zend_API.h
| From: | Stanislav Malyshev | Date: | Thu, 02 Apr 2015 06:43:33 +0000 |
| Subject: | com php-src: Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4": Zend/zend_API.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86044@lists.php.net to get a copy of this message | ||
Commit: caecd88237f260c78428feb0acc6578618fa231b
Author: Stanislav Malyshev <stas@php.net> Wed, 1 Apr 2015 23:43:33 -0700
Parents: 75f40ae1f3a7ca837d230f099627d121f9b3a32f
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=caecd88237f260c78428feb0acc6578618fa231b
Log:
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.
Changed paths:
M Zend/zend_API.h
Diff:
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 17672ff..84acfca 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) \