From dd7cf2244311603e76f89d1c766767664c8527fc Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Tue, 10 Sep 2002 18:34:16 +0000 Subject: @- Fixed array_merge_recursive() to avoid problems with merging cyclical @ arrays (bug #16064). (Andrei) --- ext/standard/php_array.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/standard/php_array.h') diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index 96c05a7a37..0ef979c550 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -83,7 +83,7 @@ PHP_FUNCTION(array_key_exists); PHP_FUNCTION(array_chunk); HashTable* php_splice(HashTable *, int, int, zval ***, int, HashTable **); -PHPAPI void php_array_merge(HashTable *dest, HashTable *src, int recursive); +PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive); int multisort_compare(const void *a, const void *b TSRMLS_DC); typedef struct { -- cgit v1.2.1