diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-12 16:41:45 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-12 16:41:45 +0200 |
commit | f61f122b9a9ef32afb3a1606d0ceb37edc8722ee (patch) | |
tree | 916ff4195d464d3b8204d97226a775dd7a751c0f /Zend/zend_inheritance.h | |
parent | b59f6e4fb18022b895bd2ae2d0f70030cc84da8a (diff) | |
parent | 4b9ebd837b6fc20bd907ae858375737e91365ede (diff) | |
download | php-git-f61f122b9a9ef32afb3a1606d0ceb37edc8722ee.tar.gz |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_inheritance.h')
-rw-r--r-- | Zend/zend_inheritance.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.h b/Zend/zend_inheritance.h index 05352052cc..6cf2d1b78d 100644 --- a/Zend/zend_inheritance.h +++ b/Zend/zend_inheritance.h @@ -30,7 +30,7 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par #define zend_do_inheritance(ce, parent_ce) \ zend_do_inheritance_ex(ce, parent_ce, 0) -ZEND_API void zend_do_link_class(zend_class_entry *ce, zend_string *lc_parent_name); +ZEND_API int zend_do_link_class(zend_class_entry *ce, zend_string *lc_parent_name); void zend_verify_abstract_class(zend_class_entry *ce); void zend_build_properties_info_table(zend_class_entry *ce); |