summaryrefslogtreecommitdiff
path: root/Zend/zend_API.h
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-03-21 21:10:32 +0800
committerXinchen Hui <laruence@php.net>2013-03-21 21:10:32 +0800
commit79925094c40a46a270fc079ddd6c2c92ff62c10f (patch)
tree06c69df2c9ef320294ae384500bf4159f2d518f9 /Zend/zend_API.h
parentf2383dead69d59143fee1d54de98f154d6833714 (diff)
parent7dce0194c815cdc75a780b6471660042aed7bd7a (diff)
downloadphp-git-79925094c40a46a270fc079ddd6c2c92ff62c10f.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'Zend/zend_API.h')
-rw-r--r--Zend/zend_API.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index c26141b183..26aa1e6b17 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -521,6 +521,9 @@ ZEND_API void zend_reset_all_cv(HashTable *symbol_table TSRMLS_DC);
ZEND_API void zend_rebuild_symbol_table(TSRMLS_D);
+ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name, zend_uint len);
+ZEND_API const char* zend_resolve_method_name(zend_class_entry *ce, zend_function *f);
+
#define add_method(arg, key, method) add_assoc_function((arg), (key), (method))
ZEND_API ZEND_FUNCTION(display_disabled_function);