diff options
| author | Andrei Zmievski <andrei@php.net> | 2002-09-10 18:34:16 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2002-09-10 18:34:16 +0000 |
| commit | dd7cf2244311603e76f89d1c766767664c8527fc (patch) | |
| tree | 125b193268e4318a17fa5e75e9e1bf26fc0da91e /ext/standard/php_array.h | |
| parent | 1f6770ddae99892a17e22783de9dcc2bfc5a7c2e (diff) | |
| download | php-git-dd7cf2244311603e76f89d1c766767664c8527fc.tar.gz | |
@- Fixed array_merge_recursive() to avoid problems with merging cyclical
@ arrays (bug #16064). (Andrei)
Diffstat (limited to 'ext/standard/php_array.h')
| -rw-r--r-- | ext/standard/php_array.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |