From: Richard Fussenegger Date: Sun, 14 May 2017 13:43:31 +0000 (+0200) Subject: Fixed ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO macro X-Git-Tag: php-7.2.0alpha3~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66e5dc5b9b3ca5cf935be7211a821d51d1556890;p=php Fixed ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO macro The macro was expanding to a wrong macro and thus leads to compile errors upon usage. Changed it to expand to the correct macro. --- diff --git a/Zend/zend_API.h b/Zend/zend_API.h index 4ce6d91b87..9c81d99a97 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -107,12 +107,12 @@ typedef struct _zend_fcall_info_cache { #define ZEND_ARG_VARIADIC_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) { #name, ZEND_TYPE_ENCODE(type_hint, allow_null), pass_by_ref, 1 }, #define ZEND_ARG_VARIADIC_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name, ZEND_TYPE_ENCODE_CLASS_CONST(#classname, allow_null), pass_by_ref, 1 }, - -#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, classname, allow_null) \ +#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ static const zend_internal_arg_info name[] = { \ - { (const char*)(zend_uintptr_t)(required_num_args), ZEND_TYPE_ENCODE_CLASS_CONST(#classname, allow_null), return_reference, 0 }, + { (const char*)(zend_uintptr_t)(required_num_args), ZEND_TYPE_ENCODE_CLASS_CONST(#class_name, allow_null), return_reference, 0 }, + #define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(name, class_name, allow_null) \ - ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, 0, -1, class_name, allow_null) + ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, -1, class_name, allow_null) #define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \ static const zend_internal_arg_info name[] = { \