diff options
| author | Anatol Belski <ab@php.net> | 2017-07-01 20:06:39 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-01 20:06:39 +0200 |
| commit | 9d1575c4956cd0018ae0a8f7f393600a1de1f05a (patch) | |
| tree | 22c05b971ac64093f894f4f53ae3f90fc149a2ff /Zend | |
| parent | 667185a26441220d323b0d3f5517026dd49a1d92 (diff) | |
| parent | d0b7eed0c9d873a0606dbbc7e33f14492f1a3dd6 (diff) | |
| download | php-git-9d1575c4956cd0018ae0a8f7f393600a1de1f05a.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
yet one C++ compat fix
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_object_handlers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h index ecb4f6e1a0..f9577eab18 100644 --- a/Zend/zend_object_handlers.h +++ b/Zend/zend_object_handlers.h @@ -155,12 +155,12 @@ struct _zend_object_handlers { zend_object_compare_zvals_t compare; }; +BEGIN_EXTERN_C() extern ZEND_API zend_object_handlers std_object_handlers; #define zend_get_function_root_class(fbc) \ ((fbc)->common.prototype ? (fbc)->common.prototype->common.scope : (fbc)->common.scope) -BEGIN_EXTERN_C() ZEND_API union _zend_function *zend_std_get_static_method(zend_class_entry *ce, zend_string *function_name_strval, const zval *key); ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *property_name, zend_bool silent); ZEND_API ZEND_COLD zend_bool zend_std_unset_static_property(zend_class_entry *ce, zend_string *property_name); |