cvs: ZendEngine2 / zend_variables.c zend_variables.h

andi Mon Sep 27 03:04:37 2004 EDT Modified files: /ZendEngine2 zend_variables.c zend_variables.h Log: - Use zval_ctor_func() for wrapper and update the prototype to void http://cvs.php.net/diff.php/ZendEngine2/zend_variables.c?r1=1.60&r2=1.61&ty=u Index: ZendEngine2/zend_variables.c diff -u ZendEngine2/zend_variables.c:1.60 ZendEngine2/zend_variables.c:1.61 --- ZendEngine2/zend_variables.c:1.60 Sun Sep 26 22:29:01 2004 +++ ZendEngine2/zend_variables.c Mon Sep 27 03:04:36 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_variables.c,v 1.60 2004/09/27 02:29:01 andi Exp $ */ +/* $Id: zend_variables.c,v 1.61 2004/09/27 07:04:36 andi Exp $ */ #include <stdio.h> #include "zend.h" @@ -152,9 +152,9 @@ #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); } http://cvs.php.net/diff.php/ZendEngine2/zend_variables.h?r1=1.32&r2=1.33&ty=u Index: ZendEngine2/zend_variables.h diff -u ZendEngine2/zend_variables.h:1.32 ZendEngine2/zend_variables.h:1.33 --- ZendEngine2/zend_variables.h:1.32 Sun Sep 26 22:29:01 2004 +++ ZendEngine2/zend_variables.h Mon Sep 27 03:04:36 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_variables.h,v 1.32 2004/09/27 02:29:01 andi Exp $ */ +/* $Id: zend_variables.h,v 1.33 2004/09/27 07:04:36 andi Exp $ */ #ifndef ZEND_VARIABLES_H #define ZEND_VARIABLES_H @@ -57,7 +57,7 @@ #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 @@ #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