diff options
| -rwxr-xr-x | ext/spl/php_spl.c | 4 | ||||
| -rwxr-xr-x | ext/spl/spl_functions.c | 6 | ||||
| -rwxr-xr-x | ext/spl/spl_functions.h | 6 | ||||
| -rwxr-xr-x | ext/spl/spl_iterators.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index b491fa8127..686068eee5 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -45,7 +45,7 @@ ZEND_DECLARE_MODULE_GLOBALS(spl) /* {{{ spl_functions_none */ -function_entry spl_functions_none[] = { +zend_function_entry spl_functions_none[] = { {NULL, NULL, NULL} }; /* }}} */ @@ -599,7 +599,7 @@ PHP_MINFO_FUNCTION(spl) /* {{{ spl_functions */ -function_entry spl_functions[] = { +zend_function_entry spl_functions[] = { PHP_FE(spl_classes, NULL) PHP_FE(spl_autoload, NULL) PHP_FE(spl_autoload_extensions, NULL) diff --git a/ext/spl/spl_functions.c b/ext/spl/spl_functions.c index cffdb89cd6..885caeb6dc 100755 --- a/ext/spl/spl_functions.c +++ b/ext/spl/spl_functions.c @@ -50,7 +50,7 @@ void spl_register_interface(zend_class_entry ** ppce, char * class_name, zend_fu /* }}} */ /* {{{ spl_register_std_class */ -void spl_register_std_class(zend_class_entry ** ppce, char * class_name, void * obj_ctor, function_entry * function_list TSRMLS_DC) +void spl_register_std_class(zend_class_entry ** ppce, char * class_name, void * obj_ctor, zend_function_entry * function_list TSRMLS_DC) { zend_class_entry ce; @@ -66,7 +66,7 @@ void spl_register_std_class(zend_class_entry ** ppce, char * class_name, void * /* }}} */ /* {{{ spl_register_sub_class */ -void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, void *obj_ctor, function_entry * function_list TSRMLS_DC) +void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, void *obj_ctor, zend_function_entry * function_list TSRMLS_DC) { zend_class_entry ce; @@ -91,7 +91,7 @@ void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * p /* }}} */ /* {{{ spl_register_functions */ -void spl_register_functions(zend_class_entry * class_entry, function_entry * function_list TSRMLS_DC) +void spl_register_functions(zend_class_entry * class_entry, zend_function_entry * function_list TSRMLS_DC) { zend_register_functions(class_entry, function_list, &class_entry->function_table, MODULE_PERSISTENT TSRMLS_CC); } diff --git a/ext/spl/spl_functions.h b/ext/spl/spl_functions.h index 798456023f..325d71b6cf 100755 --- a/ext/spl/spl_functions.h +++ b/ext/spl/spl_functions.h @@ -57,13 +57,13 @@ typedef zend_object_value (*create_object_func_t)(zend_class_entry *class_type T void spl_destroy_class(zend_class_entry ** ppce); -void spl_register_std_class(zend_class_entry ** ppce, char * class_name, create_object_func_t ctor, function_entry * function_list TSRMLS_DC); -void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, create_object_func_t ctor, function_entry * function_list TSRMLS_DC); +void spl_register_std_class(zend_class_entry ** ppce, char * class_name, create_object_func_t ctor, zend_function_entry * function_list TSRMLS_DC); +void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * parent_ce, char * class_name, create_object_func_t ctor, zend_function_entry * function_list TSRMLS_DC); void spl_register_interface(zend_class_entry ** ppce, char * class_name, zend_function_entry *functions TSRMLS_DC); void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * parent_class TSRMLS_DC); -void spl_register_functions(zend_class_entry * class_entry, function_entry * function_list TSRMLS_DC); +void spl_register_functions(zend_class_entry * class_entry, zend_function_entry * function_list TSRMLS_DC); void spl_register_property( zend_class_entry * class_entry, char *prop_name, zval *prop_val, int prop_flags TSRMLS_DC); /* sub: whether to allow subclasses/interfaces diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 6f1ae05bd2..572f06e3d8 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -54,7 +54,7 @@ PHPAPI zend_class_entry *spl_ce_InfiniteIterator; PHPAPI zend_class_entry *spl_ce_EmptyIterator; PHPAPI zend_class_entry *spl_ce_AppendIterator; -function_entry spl_funcs_RecursiveIterator[] = { +zend_function_entry spl_funcs_RecursiveIterator[] = { SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL) SPL_ABSTRACT_ME(RecursiveIterator, getChildren, NULL) {NULL, NULL, NULL} |