edink Tue Sep 10 18:36:44 2002 EDT
Modified files:
/php4/ext/standard array.c php_array.h
Log:
Fixed ZTS build.
Index: php4/ext/standard/array.c
diff -u php4/ext/standard/array.c:1.186 php4/ext/standard/array.c:1.187
--- php4/ext/standard/array.c:1.186 Tue Sep 10 14:34:16 2002
+++ php4/ext/standard/array.c Tue Sep 10 18:36:43 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.186 2002/09/10 18:34:16 andrei Exp $ */
+/* $Id: array.c,v 1.187 2002/09/10 22:36:43 edink Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1966,7 +1966,7 @@
/* }}} */
-PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive)
+PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS_DC)
{
zval **src_entry,
**dest_entry;
@@ -1984,13 +1984,13 @@
(void
**)&dest_entry) == SUCCESS) {
if (*src_entry == *dest_entry) {
zend_error(E_WARNING, "%s(): recursion
detected",
-
get_active_function_name());
+
+get_active_function_name(TSRMLS_C));
return 0;
}
convert_to_array_ex(dest_entry);
convert_to_array_ex(src_entry);
if (!php_array_merge(Z_ARRVAL_PP(dest_entry),
-
Z_ARRVAL_PP(src_entry), recursive))
+
+Z_ARRVAL_PP(src_entry), recursive TSRMLS_CC))
return 0;
} else {
(*src_entry)->refcount++;
@@ -2036,7 +2036,7 @@
for (i=0; i<argc; i++) {
SEPARATE_ZVAL(args[i]);
convert_to_array_ex(args[i]);
- php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]),
recursive);
+ php_array_merge(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(args[i]),
+recursive TSRMLS_CC);
}
efree(args);
Index: php4/ext/standard/php_array.h
diff -u php4/ext/standard/php_array.h:1.36 php4/ext/standard/php_array.h:1.37
--- php4/ext/standard/php_array.h:1.36 Tue Sep 10 14:34:16 2002
+++ php4/ext/standard/php_array.h Tue Sep 10 18:36:43 2002
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_array.h,v 1.36 2002/09/10 18:34:16 andrei Exp $ */
+/* $Id: php_array.h,v 1.37 2002/09/10 22:36:43 edink Exp $ */
#ifndef PHP_ARRAY_H
#define PHP_ARRAY_H
@@ -83,7 +83,7 @@
PHP_FUNCTION(array_chunk);
HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **);
-PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive);
+PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS_DC);
int multisort_compare(const void *a, const void *b TSRMLS_DC);
typedef struct {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
