diff options
author | Dmitry Stogov <dmitry@zend.com> | 2014-12-11 19:18:31 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2014-12-11 19:18:31 +0300 |
commit | 381438e5df4534d5b2f0d5c7008289d35d4c372a (patch) | |
tree | f11d3a777165c184ee5e4306733d71e8527f97bd /ext/standard/php_array.h | |
parent | 73458e8f19525c7814482161e86ab8bc266633fe (diff) | |
download | php-git-381438e5df4534d5b2f0d5c7008289d35d4c372a.tar.gz |
Improved array_merge() and array_replace() (1-st array may be added using simple procedure).
Diffstat (limited to 'ext/standard/php_array.h')
-rw-r--r-- | ext/standard/php_array.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/standard/php_array.h b/ext/standard/php_array.h index d86121b277..31955042eb 100644 --- a/ext/standard/php_array.h +++ b/ext/standard/php_array.h @@ -104,7 +104,8 @@ PHP_FUNCTION(array_chunk); PHP_FUNCTION(array_combine); PHPAPI HashTable* php_splice(HashTable *, int, int, zval *, int, HashTable *); -PHPAPI int php_array_merge(HashTable *dest, HashTable *src, int recursive TSRMLS_DC); +PHPAPI int php_array_merge(HashTable *dest, HashTable *src TSRMLS_DC); +PHPAPI int php_array_merge_recursive(HashTable *dest, HashTable *src TSRMLS_DC); PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src TSRMLS_DC); PHPAPI int php_multisort_compare(const void *a, const void *b TSRMLS_DC); PHPAPI zend_long php_count_recursive(zval *array, zend_long mode TSRMLS_DC); |