svn: /php/php-src/ branches/PHP_5_3/Zend/zend_API.h branches/PHP_5_3/main/php.h branches/PHP_5_4/Zend/zend_API.h branches/PHP_5_4/main/php.h
trunk/Zend/zend_API.h trunk/main/php.h

felipe Mon, 25 Jul 2011 11:30:53 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313662 Log: - Added new macro to be used in the end of zend_function_entry declaration (Gwynne) Changed paths: U php/php-src/branches/PHP_5_3/Zend/zend_API.h U php/php-src/branches/PHP_5_3/main/php.h U php/php-src/branches/PHP_5_4/Zend/zend_API.h U php/php-src/branches/PHP_5_4/main/php.h U php/php-src/trunk/Zend/zend_API.h U php/php-src/trunk/main/php.h Modified: php/php-src/branches/PHP_5_3/Zend/zend_API.h =================================================================== --- php/php-src/branches/PHP_5_3/Zend/zend_API.h 2011-07-25 11:07:55 UTC (rev 313661) +++ php/php-src/branches/PHP_5_3/Zend/zend_API.h 2011-07-25 11:30:53 UTC (rev 313662) @@ -96,6 +96,8 @@ #define ZEND_NS_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0) #define ZEND_NS_DEP_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, ZEND_ACC_DEPRECATED) +#define ZEND_FE_END { NULL, NULL, NULL, 0, 0 } + #define ZEND_ARG_INFO(pass_by_ref, name) { #name, sizeof(#name)-1, NULL, 0, 0, 0, pass_by_ref, 0, 0 }, #define ZEND_ARG_PASS_INFO(pass_by_ref) { NULL, 0, NULL, 0, 0, 0, pass_by_ref, 0, 0 }, #define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name, sizeof(#name)-1, #classname, sizeof(#classname)-1, 0, allow_null, pass_by_ref, 0, 0 }, Modified: php/php-src/branches/PHP_5_3/main/php.h =================================================================== --- php/php-src/branches/PHP_5_3/main/php.h 2011-07-25 11:07:55 UTC (rev 313661) +++ php/php-src/branches/PHP_5_3/main/php.h 2011-07-25 11:30:53 UTC (rev 313662) @@ -351,6 +351,7 @@ #define PHP_MALIAS ZEND_MALIAS #define PHP_ABSTRACT_ME ZEND_ABSTRACT_ME #define PHP_ME_MAPPING ZEND_ME_MAPPING +#define PHP_FE_END ZEND_FE_END #define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N #define PHP_MODULE_SHUTDOWN_N ZEND_MODULE_SHUTDOWN_N Modified: php/php-src/branches/PHP_5_4/Zend/zend_API.h =================================================================== --- php/php-src/branches/PHP_5_4/Zend/zend_API.h 2011-07-25 11:07:55 UTC (rev 313661) +++ php/php-src/branches/PHP_5_4/Zend/zend_API.h 2011-07-25 11:30:53 UTC (rev 313662) @@ -96,6 +96,8 @@ #define ZEND_NS_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0) #define ZEND_NS_DEP_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, ZEND_ACC_DEPRECATED) +#define ZEND_FE_END { NULL, NULL, NULL, 0, 0 } + #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}, Modified: php/php-src/branches/PHP_5_4/main/php.h =================================================================== --- php/php-src/branches/PHP_5_4/main/php.h 2011-07-25 11:07:55 UTC (rev 313661) +++ php/php-src/branches/PHP_5_4/main/php.h 2011-07-25 11:30:53 UTC (rev 313662) @@ -359,6 +359,7 @@ #define PHP_MALIAS ZEND_MALIAS #define PHP_ABSTRACT_ME ZEND_ABSTRACT_ME #define PHP_ME_MAPPING ZEND_ME_MAPPING +#define PHP_FE_END ZEND_FE_END #define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N #define PHP_MODULE_SHUTDOWN_N ZEND_MODULE_SHUTDOWN_N Modified: php/php-src/trunk/Zend/zend_API.h =================================================================== --- php/php-src/trunk/Zend/zend_API.h 2011-07-25 11:07:55 UTC (rev 313661) +++ php/php-src/trunk/Zend/zend_API.h 2011-07-25 11:30:53 UTC (rev 313662) @@ -96,6 +96,8 @@ #define ZEND_NS_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, 0) #define ZEND_NS_DEP_FALIAS(ns, name, alias, arg_info) ZEND_NS_FENTRY(ns, name, ZEND_FN(alias), arg_info, ZEND_ACC_DEPRECATED) +#define ZEND_FE_END { NULL, NULL, NULL, 0, 0 } + #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}, Modified: php/php-src/trunk/main/php.h =================================================================== --- php/php-src/trunk/main/php.h 2011-07-25 11:07:55 UTC (rev 313661) +++ php/php-src/trunk/main/php.h 2011-07-25 11:30:53 UTC (rev 313662) @@ -359,6 +359,7 @@ #define PHP_MALIAS ZEND_MALIAS #define PHP_ABSTRACT_ME ZEND_ABSTRACT_ME #define PHP_ME_MAPPING ZEND_ME_MAPPING +#define PHP_FE_END ZEND_FE_END #define PHP_MODULE_STARTUP_N ZEND_MODULE_STARTUP_N #define PHP_MODULE_SHUTDOWN_N ZEND_MODULE_SHUTDOWN_N