summaryrefslogtreecommitdiff
path: root/Zend/zend_interfaces.h
diff options
context:
space:
mode:
authorAaron Piotrowski <aaron@trowski.com>2015-06-17 13:46:27 -0500
committerAaron Piotrowski <aaron@trowski.com>2015-06-17 13:54:09 -0500
commitc5eb924e9e43c59b564549e149b59ad9a4bee74a (patch)
tree6ac56d92c951bb887c0b987340de26899ce15764 /Zend/zend_interfaces.h
parent47fda68b031f8d1b1f3ec97e635af0726e34bdb7 (diff)
downloadphp-git-c5eb924e9e43c59b564549e149b59ad9a4bee74a.tar.gz
Rename interface macros
Renamed REGISTER_INTERFACE (formerly REGISTER_ITERATOR_INTERFACE) to REGISTER_MAGIC_INTERFACE and renamed REGISTER_ITERATOR_IMPLEMENT to REGISTER_MAGIC_IMPLEMENT. Both have now been moved to zend_interfaces.h.
Diffstat (limited to 'Zend/zend_interfaces.h')
-rw-r--r--Zend/zend_interfaces.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/Zend/zend_interfaces.h b/Zend/zend_interfaces.h
index d7b7645e16..1f7b9b3860 100644
--- a/Zend/zend_interfaces.h
+++ b/Zend/zend_interfaces.h
@@ -49,7 +49,7 @@ ZEND_API zval* zend_call_method(zval *object_pp, zend_class_entry *obj_ce, zend_
#define zend_call_method_with_2_params(obj, obj_ce, fn_proxy, function_name, retval, arg1, arg2) \
zend_call_method(obj, obj_ce, fn_proxy, function_name, sizeof(function_name)-1, retval, 2, arg1, arg2)
-#define REGISTER_INTERFACE(class_name, class_name_str) \
+#define REGISTER_MAGIC_INTERFACE(class_name, class_name_str) \
{\
zend_class_entry ce;\
INIT_CLASS_ENTRY(ce, # class_name_str, zend_funcs_ ## class_name) \
@@ -57,6 +57,9 @@ ZEND_API zval* zend_call_method(zval *object_pp, zend_class_entry *obj_ce, zend_
zend_ce_ ## class_name->interface_gets_implemented = zend_implement_ ## class_name;\
}
+#define REGISTER_MAGIC_IMPLEMENT(class_name, interface_name) \
+ zend_class_implements(zend_ce_ ## class_name, 1, zend_ce_ ## interface_name)
+
ZEND_API void zend_user_it_rewind(zend_object_iterator *_iter);
ZEND_API int zend_user_it_valid(zend_object_iterator *_iter);
ZEND_API void zend_user_it_get_current_key(zend_object_iterator *_iter, zval *key);