diff options
Diffstat (limited to 'Zend/zend_variables.h')
| -rw-r--r-- | Zend/zend_variables.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index 3159ae9ed0..eb9f0d22c7 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -27,7 +27,7 @@ BEGIN_EXTERN_C() ZEND_API void _zval_dtor_func(zval *zvalue ZEND_FILE_LINE_DC); -static inline void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC) +static zend_always_inline void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC) { if (zvalue->type <= IS_BOOL) { return; @@ -37,7 +37,7 @@ static inline void _zval_dtor(zval *zvalue ZEND_FILE_LINE_DC) ZEND_API void _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC); -static inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) +static zend_always_inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) { if (zvalue->type <= IS_BOOL) { return; @@ -45,6 +45,7 @@ static inline void _zval_copy_ctor(zval *zvalue ZEND_FILE_LINE_DC) _zval_copy_ctor_func(zvalue ZEND_FILE_LINE_RELAY_CC); } +ZEND_API int zval_copy_static_var(zval **p TSRMLS_DC, int num_args, va_list args, zend_hash_key *key); ZEND_API int zend_print_variable(zval *var); ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC); @@ -76,17 +77,6 @@ ZEND_API void _zval_internal_ptr_dtor_wrapper(zval **zvalue); ZEND_API void zval_add_ref(zval **p); -ZEND_API void zval_property_ctor(zval **); - -#ifdef ZTS -# define zval_shared_property_ctor zval_property_ctor -#else -# define zval_shared_property_ctor zval_add_ref -#endif - -#define zval_copy_property_ctor(ce) ((copy_ctor_func_t) (((ce)->type == ZEND_INTERNAL_CLASS) ? zval_shared_property_ctor : zval_add_ref)) - - END_EXTERN_C() #define ZVAL_DESTRUCTOR (void (*)(void *)) zval_dtor_wrapper |