cvs: php-src(PHP_5_3) /ext/spl spl_array.c

rrichards Fri Dec 7 13:33:11 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl spl_array.c Log: fix win build http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.6&r2=1.71.2.17.2.13.2.7&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.6 php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.7 --- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.6 Thu Dec 6 16:04:17 2007 +++ php-src/ext/spl/spl_array.c Fri Dec 7 13:33:10 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.71.2.17.2.13.2.6 2007/12/06 16:04:17 helly Exp $ */ +/* $Id: spl_array.c,v 1.71.2.17.2.13.2.7 2007/12/07 13:33:10 rrichards Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1446,17 +1446,16 @@ zval *object = getThis(); spl_array_object *intern = (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC); + zval **entry, members, *pmembers; + HashPosition pos; + php_serialize_data_t var_hash; + smart_str buf = {0}; if (!aht) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Array was modified outside object and is no longer an array"); return; } - zval **entry, members, *pmembers; - HashPosition pos; - php_serialize_data_t var_hash; - smart_str buf = {0}; - PHP_VAR_SERIALIZE_INIT(var_hash); /* storage */