diff options
author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /Zend/zend_inheritance.h | |
parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
download | php-git-POST_NATIVE_TLS_MERGE.tar.gz |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'Zend/zend_inheritance.h')
-rw-r--r-- | Zend/zend_inheritance.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_inheritance.h b/Zend/zend_inheritance.h index 647b492371..d4810acca1 100644 --- a/Zend/zend_inheritance.h +++ b/Zend/zend_inheritance.h @@ -24,14 +24,14 @@ BEGIN_EXTERN_C() -ZEND_API void zend_do_inherit_interfaces(zend_class_entry *ce, const zend_class_entry *iface TSRMLS_DC); -ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface TSRMLS_DC); +ZEND_API void zend_do_inherit_interfaces(zend_class_entry *ce, const zend_class_entry *iface); +ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface); -ZEND_API void zend_do_implement_trait(zend_class_entry *ce, zend_class_entry *trait TSRMLS_DC); -ZEND_API void zend_do_bind_traits(zend_class_entry *ce TSRMLS_DC); +ZEND_API void zend_do_implement_trait(zend_class_entry *ce, zend_class_entry *trait); +ZEND_API void zend_do_bind_traits(zend_class_entry *ce); -ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce TSRMLS_DC); -void zend_do_early_binding(TSRMLS_D); +ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce); +void zend_do_early_binding(void); END_EXTERN_C() |