summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2011-07-25 11:30:53 +0000
committerFelipe Pena <felipe@php.net>2011-07-25 11:30:53 +0000
commitf8a3334c89defdff21e4e658d2fd531d540cf231 (patch)
treed2b235e6fb9a73ae2d1c39a8c56026bb240aa23c
parentc168ea847783d1ccf08980bd811a0f2d4ea7cf89 (diff)
downloadphp-git-f8a3334c89defdff21e4e658d2fd531d540cf231.tar.gz
- Added new macro to be used in the end of zend_function_entry declaration (Gwynne)
-rw-r--r--Zend/zend_API.h2
-rw-r--r--main/php.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index db040f6be4..487356e575 100644
--- 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},
#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},
diff --git a/main/php.h b/main/php.h
index e108c25413..7af265c78a 100644
--- a/main/php.h
+++ b/main/php.h
@@ -359,6 +359,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