diff options
| author | Andi Gutmans <andi@php.net> | 2004-09-27 07:04:36 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2004-09-27 07:04:36 +0000 |
| commit | 4a03738225f5a786433c24df0468572270ec0395 (patch) | |
| tree | 43a87d462ec5f7ce76508c0508fb90d5954aef54 | |
| parent | 67fc0f2bfe434868f411fcb7dbaa32ba866da0b7 (diff) | |
| download | php-git-4a03738225f5a786433c24df0468572270ec0395.tar.gz | |
- Use zval_ctor_func() for wrapper and update the prototype to void
| -rw-r--r-- | Zend/zend_variables.c | 4 | ||||
| -rw-r--r-- | Zend/zend_variables.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index 1cc55eb083..9da26b6cd2 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -152,9 +152,9 @@ ZEND_API int zend_print_variable(zval *var) #if ZEND_DEBUG -ZEND_API int _zval_copy_ctor_wrapper(zval *zvalue) +ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue) { - return zval_copy_ctor(zvalue); + zval_copy_ctor(zvalue); } diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h index f8183e5ae3..a6661ec5e1 100644 --- a/Zend/zend_variables.h +++ b/Zend/zend_variables.h @@ -57,7 +57,7 @@ ZEND_API void _zval_internal_ptr_dtor(zval **zvalue ZEND_FILE_LINE_DC); #define zval_internal_ptr_dtor(zvalue) _zval_internal_ptr_dtor((zvalue) ZEND_FILE_LINE_CC) #if ZEND_DEBUG -ZEND_API int _zval_copy_ctor_wrapper(zval *zvalue); +ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue); ZEND_API void _zval_dtor_wrapper(zval *zvalue); ZEND_API void _zval_ptr_dtor_wrapper(zval **zval_ptr); ZEND_API void _zval_internal_dtor_wrapper(zval *zvalue); @@ -68,8 +68,8 @@ ZEND_API void _zval_internal_ptr_dtor_wrapper(zval **zvalue); #define zval_internal_dtor_wrapper _zval_internal_dtor_wrapper #define zval_internal_ptr_dtor_wrapper _zval_internal_ptr_dtor_wrapper #else -#define zval_copy_ctor_wrapper _zval_copy_ctor -#define zval_dtor_wrapper _zval_dtor +#define zval_copy_ctor_wrapper _zval_copy_ctor_func +#define zval_dtor_wrapper _zval_dtor_func #define zval_ptr_dtor_wrapper _zval_ptr_dtor #define zval_internal_dtor_wrapper _zval_internal_dtor #define zval_internal_ptr_dtor_wrapper _zval_internal_ptr_dtor |