Zend Inheritence

Girgias · Girgias · commit 9c477bcf7011 · 2020-09-08T14:47:27.000+02:00
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -1401,8 +1401,6 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *par
 }
 /* }}} */
 
-extern ZEND_API inline void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce);
-
 static zend_bool do_inherit_constant_check(HashTable *child_constants_table, zend_class_constant *parent_constant, zend_string *name, const zend_class_entry *iface) /* {{{ */
 {
 	zval *zv = zend_hash_find_ex(child_constants_table, name, 1);
diff --git a/Zend/zend_inheritance.h b/Zend/zend_inheritance.h
@@ -27,7 +27,7 @@ BEGIN_EXTERN_C()
 ZEND_API void zend_do_implement_interface(zend_class_entry *ce, zend_class_entry *iface);
 ZEND_API void zend_do_inheritance_ex(zend_class_entry *ce, zend_class_entry *parent_ce, zend_bool checked);
 
-ZEND_API inline void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce) {
+static inline void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent_ce) {
 	zend_do_inheritance_ex(ce, parent_ce, 0);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1401,8 +1401,6 @@ ZEND_API void zend_do_inheritance_ex(zend_class_entry ce, zend_class_entry par`
`1401`	`1401`	`}`
`1402`	`1402`	`/* }}} */`
`1403`	`1403`
`1404`		`-extern ZEND_API inline void zend_do_inheritance(zend_class_entry ce, zend_class_entry parent_ce);`
`1405`		`-`
`1406`	`1404`	`static zend_bool do_inherit_constant_check(HashTable child_constants_table, zend_class_constant parent_constant, zend_string name, const zend_class_entry iface) /* {{{ */`
`1407`	`1405`	`{`
`1408`	`1406`	`zval *zv = zend_hash_find_ex(child_constants_table, name, 1);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ BEGIN_EXTERN_C()`
`27`	`27`	`ZEND_API void zend_do_implement_interface(zend_class_entry ce, zend_class_entry iface);`
`28`	`28`	`ZEND_API void zend_do_inheritance_ex(zend_class_entry ce, zend_class_entry parent_ce, zend_bool checked);`
`29`	`29`
`30`		`-ZEND_API inline void zend_do_inheritance(zend_class_entry ce, zend_class_entry parent_ce) {`
	`30`	`+static inline void zend_do_inheritance(zend_class_entry ce, zend_class_entry parent_ce) {`
`31`	`31`	`zend_do_inheritance_ex(ce, parent_ce, 0);`
`32`	`32`	`}`
`33`	`33`