[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard array.c

[Rob Richards]

rrichards               Fri Jan 25 15:52:48 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard       array.c 
  Log:
  MFH: fix zts build
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.16&r2=1.308.2.21.2.37.2.17&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.16 
php-src/ext/standard/array.c:1.308.2.21.2.37.2.17
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.16   Fri Jan 25 13:42:36 2008
+++ php-src/ext/standard/array.c        Fri Jan 25 15:52:48 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: array.c,v 1.308.2.21.2.37.2.16 2008/01/25 13:42:36 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.17 2008/01/25 15:52:48 rrichards Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -1432,7 +1432,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) /* {{{ */
 {
        zval **value_ptr, *value, *data;
 
@@ -1461,7 +1461,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--;
@@ -1489,7 +1489,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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php