- Use zval_ctor_func() for wrapper and update the prototype to void

diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index 1cc55eb0834ab851dbaae0f373210a4ac7150f0d..9da26b6cd2331f9f049ecadd83657de53ff65757 100644 (file)
--- 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 f8183e5ae38c707425f264fc838ea5fc95fc5f41..a6661ec5e1f1049a1d1e622d5efebb72ebc074c0 100644 (file)
--- 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