- Added new macro to be used in the end of zend_function_entry declaration (Gwynne)

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 18040a8a36a29cf68a9ecb4d47cf2cc88c09c012..950aea555e3ae149f4ad051da1a39145c39c59f2 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -96,6 +96,8 @@ typedef struct _zend_fcall_info_cache {
 #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 },

diff --git a/main/php.h b/main/php.h
index 325c85924a3ced9a0a79ac7df32a6bf6f6e9bdd4..a3c9070db100f0950a07df77cdfd1d914d64c511 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -351,6 +351,7 @@ END_EXTERN_C()
 #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