mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
MFH: fix zts build
This commit is contained in:
parent
2907ae9d73
commit
90f168deae
@ -1432,7 +1432,7 @@ PHP_FUNCTION(extract)
|
|||||||
}
|
}
|
||||||
/* }}} */
|
/* }}} */
|
||||||
|
|
||||||
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) /* {{{ */
|
||||||
{
|
{
|
||||||
zval **value_ptr, *value, *data;
|
zval **value_ptr, *value, *data;
|
||||||
|
|
||||||
@ -1461,7 +1461,7 @@ static void php_compact_var(HashTable *eg_active_symbol_table, zval *return_valu
|
|||||||
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(entry), (void**)&value_ptr, &pos) == SUCCESS) {
|
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(entry), (void**)&value_ptr, &pos) == SUCCESS) {
|
||||||
value = *value_ptr;
|
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);
|
zend_hash_move_forward_ex(Z_ARRVAL_P(entry), &pos);
|
||||||
}
|
}
|
||||||
Z_ARRVAL_P(entry)->nApplyCount--;
|
Z_ARRVAL_P(entry)->nApplyCount--;
|
||||||
@ -1489,7 +1489,7 @@ PHP_FUNCTION(compact)
|
|||||||
array_init(return_value);
|
array_init(return_value);
|
||||||
|
|
||||||
for (i=0; i<ZEND_NUM_ARGS(); i++) {
|
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);
|
efree(args);
|
||||||
|
Loading…
Reference in New Issue
Block a user