diff options
Diffstat (limited to 'ext/spl/spl_functions.h')
| -rwxr-xr-x | ext/spl/spl_functions.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ext/spl/spl_functions.h b/ext/spl/spl_functions.h index f6a7b57ab4..a68ffacede 100755 --- a/ext/spl/spl_functions.h +++ b/ext/spl/spl_functions.h @@ -23,14 +23,11 @@ typedef zend_object_value (*create_object_func_t)(zend_class_entry *class_type TSRMLS_DC); -#define REGISTER_SPL_NAMESPACE(namespace_name) \ - spl_register_namespace(&spl_ns_ ## namespace_name, # namespace_name TSRMLS_CC); - #define REGISTER_SPL_STD_CLASS(namespace_name, class_name, obj_ctor) \ - spl_register_std_class(&spl_ce_ ## class_name, spl_ns_ ## namespace_name, # class_name, obj_ctor TSRMLS_CC); + spl_register_std_class(&spl_ce_ ## class_name, "spl_" # class_name, obj_ctor TSRMLS_CC); #define REGISTER_SPL_INTERFACE(namespace_name, class_name) \ - spl_register_interface(&spl_ce_ ## class_name, spl_ns_ ## namespace_name, # class_name TSRMLS_CC); + spl_register_interface(&spl_ce_ ## class_name, "spl_" # class_name TSRMLS_CC); #define REGISTER_SPL_INTF_FUNC(namespace_name, class_name, function_name) \ spl_register_interface_function(spl_ce_ ## class_name, # function_name TSRMLS_CC); @@ -46,11 +43,9 @@ 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_namespace(zend_namespace ** ppns, char * namespace_name TSRMLS_DC); - -void spl_register_std_class(zend_class_entry ** ppce, zend_namespace * namespace_entry, char * class_name, create_object_func_t ctor TSRMLS_DC); +void spl_register_std_class(zend_class_entry ** ppce, char * class_name, create_object_func_t ctor TSRMLS_DC); -void spl_register_interface(zend_class_entry ** ppce, zend_namespace * namespace_entry, char * class_name TSRMLS_DC); +void spl_register_interface(zend_class_entry ** ppce, char * class_name TSRMLS_DC); void spl_register_interface_function(zend_class_entry * class_entry, char * fn_name TSRMLS_DC); void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * parent_class TSRMLS_DC); @@ -59,7 +54,7 @@ void spl_register_functions(zend_class_entry * class_entry, function_entry * fun char * spl_make_fully_qualyfied_name(zend_class_entry * pce TSRMLS_DC); void spl_add_class_name(zval * list, zend_class_entry * pce TSRMLS_DC); -void spl_add_interfaces(zval *list, zend_class_entry * pce TSRMLS_DC); +void spl_add_interfaces(zval * list, zend_class_entry * pce TSRMLS_DC); int spl_add_classes(zend_class_entry ** ppce, zval *list TSRMLS_DC); #define SPL_CLASS_FE(class_name, function_name, arg_types) \ |