cvs: php-src /ext/standard array.c

rrichards Fri Jan 25 15:52:00 2008 UTC Modified files: /php-src/ext/standard array.c Log: fix zts build http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.437&r2=1.438&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.437 php-src/ext/standard/array.c:1.438 --- php-src/ext/standard/array.c:1.437 Fri Jan 25 13:42:24 2008 +++ php-src/ext/standard/array.c Fri Jan 25 15:52:00 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.437 2008/01/25 13:42:24 tony2001 Exp $ */ +/* $Id: array.c,v 1.438 2008/01/25 15:52:00 rrichards Exp $ */ #include "php.h" #include "php_ini.h" @@ -1534,7 +1534,7 @@ } /* }}} */ -static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_value, zval *entry) /* {{{ */ +static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_value, zval *entry TSRMLS_DC) /* {{{ */ { zstr key; int key_len; @@ -1585,7 +1585,7 @@ while (zend_hash_get_current_data_ex(Z_ARRVAL_P(entry), (void**)&value_ptr, &pos) == SUCCESS) { value = *value_ptr; - php_compact_var(eg_active_symbol_table, return_value, value); + php_compact_var(eg_active_symbol_table, return_value, value TSRMLS_CC); zend_hash_move_forward_ex(Z_ARRVAL_P(entry), &pos); } Z_ARRVAL_P(entry)->nApplyCount--; @@ -1613,7 +1613,7 @@ array_init(return_value); for (i=0; i<ZEND_NUM_ARGS(); i++) { - php_compact_var(EG(active_symbol_table), return_value, *args[i]); + php_compact_var(EG(active_symbol_table), return_value, *args[i] TSRMLS_CC); } efree(args);