cvs: php-src /ext/spl php_spl.c

dmitry Mon Apr 9 15:33:59 2007 UTC Modified files: /php-src/ext/spl php_spl.c Log: Usage of sizeof(void*) is not portable http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.113&r2=1.114&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.113 php-src/ext/spl/php_spl.c:1.114 --- php-src/ext/spl/php_spl.c:1.113 Fri Apr 6 21:07:48 2007 +++ php-src/ext/spl/php_spl.c Mon Apr 9 15:33:59 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.113 2007/04/06 21:07:48 helly Exp $ */ +/* $Id: php_spl.c,v 1.114 2007/04/09 15:33:59 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -549,7 +549,7 @@ if (success != SUCCESS && obj_ptr) { size_t func_name_len = Z_UNISIZE(zfunc_name); lc_name.v = erealloc(lc_name.v, func_name_len + 2 + sizeof(zend_object_handle)); - memcpy(lc_name.v + func_name_len, &Z_OBJ_HANDLE_PP(obj_ptr), sizeof(zend_object_handle)); + memcpy(lc_name.s + func_name_len, &Z_OBJ_HANDLE_PP(obj_ptr), sizeof(zend_object_handle)); func_name_len += sizeof(zend_object_handle); if (Z_TYPE(zfunc_name) == IS_UNICODE) { func_name_len /= sizeof(UChar);